summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/04/asm/arm_04.s312
-rw-r--r--arm9/modules/04/asm/thumb_04.s30
-rw-r--r--arm9/modules/13/asm/module_13_arm2.s40
-rw-r--r--arm9/modules/13/asm/module_13_thumb.s130
-rw-r--r--arm9/modules/55/asm/module_55.s10
-rw-r--r--arm9/modules/56/asm/module_56.s4
-rw-r--r--arm9/modules/79/asm/module_79_arm.s2
-rw-r--r--arm9/modules/80/asm/module_80.s4
-rw-r--r--arm9/modules/82/asm/module_82.s4
9 files changed, 268 insertions, 268 deletions
diff --git a/arm9/modules/04/asm/arm_04.s b/arm9/modules/04/asm/arm_04.s
index e76d9801..98bffb4c 100644
--- a/arm9/modules/04/asm/arm_04.s
+++ b/arm9/modules/04/asm/arm_04.s
@@ -457,7 +457,7 @@ _021D9378:
_021D93AC:
add r0, r5, #0x1f
bic r0, r0, #0x1f
- bl FUN_02096760
+ bl DWCi_AUTH_MakeWiFiID
ldr r0, _021D940C ; =0x0220BF98
mov r1, r5
mov r2, #0
@@ -718,7 +718,7 @@ MOD04_021D96EC: ; 0x021D96EC
cmp r4, #1
bne _021D9758
ldr r0, _021D97EC ; =0x0221046C
- bl FUN_02095EC8
+ bl DWCi_BM_GetWiFiInfo
_021D9758:
ldr r0, _021D97E8 ; =0x02210468
ldr r2, _021D97F0 ; =0x000011CC
@@ -1411,7 +1411,7 @@ _021DA104:
bl OS_SNPrintf
bl OS_DisableInterrupts
mov sb, r0
- bl FUN_020A8850
+ bl WCM_GetApMacAddress
mov r8, r0
mov r1, #6
bl DC_InvalidateRange
@@ -1442,7 +1442,7 @@ _021DA180:
mov r1, #0xe
bl OS_SNPrintf
add r0, sp, #0x14
- bl FUN_020A87E0
+ bl WCM_GetApEssid
mov r5, r0
mov r1, #0x20
bl DC_InvalidateRange
@@ -1482,7 +1482,7 @@ MOD04_021DA238: ; 0x021DA238
sub sp, sp, #0x18
mov r4, r0
add r0, sp, #0
- bl FUN_02095EC8
+ bl DWCi_BM_GetWiFiInfo
add r1, sp, #0
mov r0, r4
bl MOD04_021D9F78
@@ -2415,7 +2415,7 @@ MOD04_021DAF18: ; 0x021DAF18
streq r1, [r0, #0x20]
addeq sp, sp, #0xc
ldmeqia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
- bl FUN_0209CB44
+ bl CPS_SocUse
add r0, sl, #0x1000
ldr r0, [r0, #0x12c]
cmp r0, #1
@@ -2432,23 +2432,23 @@ MOD04_021DAF18: ; 0x021DAF18
str r1, [r6, #0x800]
mov r1, #0xb
str r6, [r8, #0xc]
- bl FUN_020A3688
+ bl CPS_SetRootCa
mov r0, #1
- bl FUN_020A02EC
+ bl CPS_SetSsl
_021DAFC8:
add r0, sl, #0x1100
ldrh r1, [r0, #0x30]
mov r2, r4
mov r0, #0
- bl FUN_0209CB78
- bl FUN_0209C934
+ bl CPS_SocPingMode
+ bl CPS_TcpConnect
cmp r0, #0
beq _021DB004
add r0, sl, #0x1000
mov r1, #3
str r1, [r0, #0x20]
- bl FUN_0209CB24
- bl FUN_0209CC10
+ bl CPS_SocRelease
+ bl CPS_SocUnRegister
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
_021DB004:
@@ -2458,14 +2458,14 @@ _021DB004:
bl strlen
mov r1, r0
mov r0, r4
- bl FUN_0209C030
+ bl CPS_SocWrite
cmp r0, #0
str r0, [sp, #8]
addle r0, sl, #0x1000
movle r1, #5
strle r1, [r0, #0x20]
ble _021DB20C
- bl FUN_0209BF4C
+ bl CPS_SocGetChar
mov r0, sl
bl MOD04_021DB3B8
cmp r0, #0
@@ -2493,7 +2493,7 @@ _021DB088:
moveq r1, #5
streq r1, [r0, #0x20]
beq _021DB20C
- bl FUN_0209BF9C
+ bl CPS_SocGetLength
str r0, [sp, #8]
cmp r0, #0
blt _021DB1E8
@@ -2503,7 +2503,7 @@ _021DB088:
mov r6, r0
add r0, sp, #8
mov r8, r1
- bl FUN_0209C638
+ bl CPS_SocRead
cmp r0, #0
beq _021DB1E8
ldr r2, [r7, #8]
@@ -2541,11 +2541,11 @@ _021DB150:
ldr r0, [sp, #8]
cmp r0, sb
bls _021DB164
- bl FUN_0209C52C
+ bl CPS_SocConsume
b _021DB1E8
_021DB164:
mov r0, sb
- bl FUN_0209C52C
+ bl CPS_SocConsume
_021DB16C:
add r0, sl, #0x1000
ldr r1, [r0, #0xa2c]
@@ -2580,20 +2580,20 @@ _021DB188:
str r1, [r0, #0x20]
b _021DB20C
_021DB1E8:
- bl FUN_0209C840
- bl FUN_0209C7AC
- bl FUN_0209CB24
- bl FUN_0209CC10
+ bl CPS_TcpShutdown
+ bl CPS_TcpClose
+ bl CPS_SocRelease
+ bl CPS_SocUnRegister
add r0, sl, #0x1000
mov r1, #8
str r1, [r0, #0x20]
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
_021DB20C:
- bl FUN_0209C840
- bl FUN_0209C7AC
- bl FUN_0209CB24
- bl FUN_0209CC10
+ bl CPS_TcpShutdown
+ bl CPS_TcpClose
+ bl CPS_SocRelease
+ bl CPS_SocUnRegister
add sp, sp, #0xc
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
@@ -2704,7 +2704,7 @@ MOD04_021DB35C: ; 0x021DB35C
ldr r2, [r1, #0x9cc]
add r0, r4, r0
str r2, [r1, #0x180]
- bl FUN_0209CC28
+ bl CPS_SocRegister
ldmia sp!, {r4, pc}
.align 2, 0
_021DB3AC: .word 0x00001134
@@ -2725,7 +2725,7 @@ MOD04_021DB3B8: ; 0x021DB3B8
ldr r0, _021DB438 ; =0x000019D0
mov r1, #0x20
add r0, r4, r0
- bl FUN_020A136C
+ bl CPS_SslAddRandomSeed
_021DB3EC:
ldr r0, _021DB43C ; =0x00001BF4
add r0, r4, r0
@@ -3343,7 +3343,7 @@ _021DBCB4:
ldr r0, [r4]
bl MOD04_021DAE4C
add r0, sp, #0x68
- bl FUN_02095EC8
+ bl DWCi_BM_GetWiFiInfo
ldr r2, [sp, #0x68]
ldr r1, [sp, #0x6c]
mov r0, #0
@@ -5451,7 +5451,7 @@ MOD04_021DD9DC: ; 0x021DD9DC
str r0, [r4]
bl OS_DisableInterrupts
mov r6, r0
- bl FUN_020A8850
+ bl WCM_GetApMacAddress
mov r5, r0
mov r1, #6
bl DC_InvalidateRange
@@ -5473,7 +5473,7 @@ _021DDA4C:
cmp r0, #3
bge _021DDAB0
add r0, sp, #0
- bl FUN_020A87E0
+ bl WCM_GetApEssid
mov r5, r0
mov r1, #0x20
bl DC_InvalidateRange
@@ -5686,7 +5686,7 @@ _021DDD28:
cmp r0, #0
addeq sp, sp, #4
ldmeqia sp!, {pc}
- bl FUN_020A71F8
+ bl WCM_GetPhase
cmp r0, #9
addeq sp, sp, #4
ldmeqia sp!, {pc}
@@ -5830,7 +5830,7 @@ MOD04_021DDEE0: ; 0x021DDEE0
str r6, [r1]
bl MOD04_021DDE7C
mov r0, r4
- bl FUN_020A374C
+ bl CPS_SetSslHandshakePriority
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_021DDF3C: .word 0x02210518
@@ -8747,7 +8747,7 @@ MOD04_021E0628: ; 0x021E0628
ldr r1, [r2, #0xc]
add r2, sp, #8
add r0, r0, #4
- bl FUN_02097218
+ bl DWCi_Acc_LoginIdToUserName
ldr r1, _021E07D0 ; =0x00000705
add r2, sp, #8
mov r0, r5
@@ -8791,7 +8791,7 @@ _021E0704:
ldr r1, [r2, #0xc]
add r2, sp, #0x1d
add r0, r0, #4
- bl FUN_02097218
+ bl DWCi_Acc_LoginIdToUserName
add r1, sp, #0x1d
add r0, r4, #0x8e
bl strcmp
@@ -8802,13 +8802,13 @@ _021E0704:
ldr r0, [r0]
ldr r1, [r0, #0xc]
add r0, r0, #0x3c
- bl FUN_02097218
+ bl DWCi_Acc_LoginIdToUserName
ldr r0, _021E07CC ; =0x022106C8
ldr r2, [r4, #4]
ldr r1, [r0]
ldr r0, [r1, #0x1c]
add r1, r1, #0x3c
- bl FUN_02096EC0
+ bl DWCi_Acc_SetLoginIdToUserData
mov r0, r5
bl MOD04_021F0D54
ldr r0, _021E07CC ; =0x022106C8
@@ -8876,7 +8876,7 @@ MOD04_021E07E4: ; 0x021E07E4
str r2, [r1, #0x24]
ldr r0, [r0]
ldr r0, [r0, #0x1c]
- bl FUN_0209702C
+ bl DWCi_Acc_IsAuthentic
cmp r0, #0
beq _021E0898
ldr r0, _021E09DC ; =0x022106C8
@@ -9002,7 +9002,7 @@ MOD04_021E0A00: ; 0x021E0A00
str r5, [r2]
str r4, [r1]
ldr r0, [r0, #0x1c]
- bl FUN_0209702C
+ bl DWCi_Acc_IsAuthentic
cmp r0, #0
beq _021E0A68
ldr r0, _021E0BB8 ; =0x022106C8
@@ -9011,20 +9011,20 @@ MOD04_021E0A00: ; 0x021E0A00
add r2, r1, #0x248
ldr r1, [r0, #0x24]
add r0, r0, #0x10
- bl FUN_02097218
+ bl DWCi_Acc_LoginIdToUserName
b _021E0B1C
_021E0A68:
ldr r0, _021E0BB8 ; =0x022106C8
ldr r0, [r0]
add r0, r0, #0x3c
- bl FUN_0209703C
+ bl DWCi_Acc_IsValidLoginId
cmp r0, #0
bne _021E0AD0
ldr r0, _021E0BB8 ; =0x022106C8
ldr r0, [r0]
ldr r0, [r0, #0x1c]
add r0, r0, #4
- bl FUN_0209705C
+ bl DWCi_Acc_CheckConsoleUserId
cmp r0, #0
beq _021E0ABC
ldr r0, _021E0BB8 ; =0x022106C8
@@ -9039,7 +9039,7 @@ _021E0ABC:
ldr r0, _021E0BB8 ; =0x022106C8
ldr r0, [r0]
add r0, r0, #0x3c
- bl FUN_020970CC
+ bl DWCi_Acc_CreateTempLoginId
b _021E0B04
_021E0AD0:
bl OS_GetTick
@@ -9054,14 +9054,14 @@ _021E0AD0:
ldr r3, [r3]
adc r1, r4, #0
add r0, r3, #0x3c
- bl FUN_02097508
+ bl DWCi_Acc_SetPlayerId
_021E0B04:
ldr r0, _021E0BB8 ; =0x022106C8
ldr r2, [r0]
ldr r1, [r2, #0xc]
add r0, r2, #0x3c
add r2, r2, #0x248
- bl FUN_02097218
+ bl DWCi_Acc_LoginIdToUserName
_021E0B1C:
ldr r0, _021E0BB8 ; =0x022106C8
ldr r0, [r0]
@@ -9534,7 +9534,7 @@ MOD04_021E110C: ; 0x021E110C
_021E115C:
ldr r0, [r2, #0x18]
add r0, r0, r7
- bl FUN_02097484
+ bl DWC_GetFriendDataType
cmp r0, #1
bne _021E11C8
bl MOD04_021E0F00
@@ -9542,7 +9542,7 @@ _021E115C:
add r2, sp, #8
ldr r1, [r1, #0x18]
add r1, r1, r7
- bl FUN_02096C78
+ bl DWC_LoginIdToUserName
add r0, sp, #8
add r1, sl, #0x8e
bl strcmp
@@ -9552,31 +9552,31 @@ _021E115C:
ldr r1, [sl, #4]
ldr r0, [r0, #0x18]
add r0, r0, r7
- bl FUN_02096C90
+ bl DWC_SetGsProfileId
ldr r0, [r4]
ldr r0, [r0, #0x18]
add r0, r0, r7
- bl FUN_02097414
+ bl DWCi_SetBuddyFriendData
mov r8, r5
b _021E125C
_021E11C8:
ldr r0, [r4]
ldr r0, [r0, #0x18]
add r0, r0, r7
- bl FUN_02097484
+ bl DWC_GetFriendDataType
cmp r0, #3
beq _021E11F8
ldr r0, [r4]
ldr r0, [r0, #0x18]
add r0, r0, r7
- bl FUN_02097484
+ bl DWC_GetFriendDataType
cmp r0, #2
bne _021E125C
_021E11F8:
ldr r0, [r4]
ldr r0, [r0, #0x18]
add r0, r0, r7
- bl FUN_02097490
+ bl DWC_IsBuddyFriendData
cmp r0, #1
streq fp, [sp]
beq _021E125C
@@ -9585,18 +9585,18 @@ _021E11F8:
ldr r1, [r4]
ldr r1, [r1, #0x18]
add r1, r1, r7
- bl FUN_02096DA0
+ bl DWC_GetGsProfileId
cmp r6, r0
bne _021E125C
ldr r0, [r4]
mov r1, r6
ldr r0, [r0, #0x18]
add r0, r0, r7
- bl FUN_02096C90
+ bl DWC_SetGsProfileId
ldr r0, [r4]
ldr r0, [r0, #0x18]
add r0, r0, r7
- bl FUN_02097414
+ bl DWCi_SetBuddyFriendData
ldr r8, [sp, #4]
_021E125C:
ldr r2, [r4]
@@ -9650,7 +9650,7 @@ MOD04_021E12B8: ; 0x021E12B8
_021E1304:
ldr r0, [r1, #0x18]
add r0, r0, r7
- bl FUN_02097484
+ bl DWC_GetFriendDataType
cmp r0, #1
bne _021E136C
bl MOD04_021E0F00
@@ -9658,7 +9658,7 @@ _021E1304:
add r2, sp, #4
ldr r1, [r1, #0x18]
add r1, r1, r7
- bl FUN_02096C78
+ bl DWC_LoginIdToUserName
ldr r1, [sp]
add r0, sp, #4
bl strcmp
@@ -9671,20 +9671,20 @@ _021E1304:
ldr r1, [sb, #4]
ldr r0, [r0, #0x18]
add r0, r0, r7
- bl FUN_02096C90
+ bl DWC_SetGsProfileId
mov fp, r5
b _021E13CC
_021E136C:
ldr r0, [r4]
ldr r0, [r0, #0x18]
add r0, r0, r7
- bl FUN_02097484
+ bl DWC_GetFriendDataType
cmp r0, #3
beq _021E139C
ldr r0, [r4]
ldr r0, [r0, #0x18]
add r0, r0, r7
- bl FUN_02097484
+ bl DWC_GetFriendDataType
cmp r0, #2
bne _021E13CC
_021E139C:
@@ -9693,7 +9693,7 @@ _021E139C:
ldr r1, [r4]
ldr r1, [r1, #0x18]
add r1, r1, r7
- bl FUN_02096DA0
+ bl DWC_GetGsProfileId
cmp r6, r0
bne _021E13CC
mov r0, sl
@@ -9742,7 +9742,7 @@ MOD04_021E1414: ; 0x021E1414
ldr r0, [r1]
ldr r0, [r0, #0x18]
add r0, r0, r6
- bl FUN_02097484
+ bl DWC_GetFriendDataType
cmp r0, #0
beq _021E15FC
ldr r7, _021E1670 ; =0x022106D0
@@ -9813,12 +9813,12 @@ _021E1548:
ldr r1, [r1]
ldr r0, [r0, #0x18]
add r0, r0, r6
- bl FUN_02096C90
+ bl DWC_SetGsProfileId
ldr r0, _021E1670 ; =0x022106D0
ldr r0, [r0]
ldr r0, [r0, #0x18]
add r0, r0, r6
- bl FUN_02097414
+ bl DWCi_SetBuddyFriendData
mov r0, r8
bl MOD04_021E1DA4
ldr r0, _021E1670 ; =0x022106D0
@@ -9871,7 +9871,7 @@ _021E1618:
ldr r1, [r1, #0x18]
mov r0, #0xc
mla r0, r8, r0, r1
- bl FUN_02097484
+ bl DWC_GetFriendDataType
cmp r0, #0
addne sp, sp, #4
ldmneia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
@@ -9951,7 +9951,7 @@ _021E1720:
_021E172C:
bl MOD04_021E0F00
mov r1, r5
- bl FUN_02096DA0
+ bl DWC_GetGsProfileId
mov r5, r0
cmp r5, #0
ble _021E176C
@@ -10042,23 +10042,23 @@ _021E1858:
cmp sb, r0
bne _021E18CC
mov r0, r6
- bl FUN_02097484
+ bl DWC_GetFriendDataType
cmp r0, #2
bne _021E1894
mov r0, r4
- bl FUN_02097484
+ bl DWC_GetFriendDataType
cmp r0, #3
bne _021E1894
mov r0, r5
mov r1, sb
- bl FUN_02096C90
+ bl DWC_SetGsProfileId
_021E1894:
mov r0, r4
- bl FUN_02097490
+ bl DWC_IsBuddyFriendData
cmp r0, #0
beq _021E18AC
mov r0, r5
- bl FUN_02097414
+ bl DWCi_SetBuddyFriendData
_021E18AC:
mov r0, fp
mov r1, r7
@@ -10105,12 +10105,12 @@ _021E1920:
bne _021E199C
mov r0, #0xc
mla r0, r6, r0, r7
- bl FUN_02097490
+ bl DWC_IsBuddyFriendData
cmp r0, #0
beq _021E1974
mov r0, #0xc
mla r0, r4, r0, r7
- bl FUN_02097490
+ bl DWC_IsBuddyFriendData
cmp r0, #0
bne _021E1974
mov r0, r7
@@ -10232,15 +10232,15 @@ _021E1AD8:
bne _021E1B24
mul sl, r4, r7
add r0, r6, sl
- bl FUN_02097490
+ bl DWC_IsBuddyFriendData
cmp r0, #0
bne _021E1B30
add sl, r6, sl
ldr r1, [sp, #0x38]
mov r0, sl
- bl FUN_02096C90
+ bl DWC_SetGsProfileId
mov r0, sl
- bl FUN_02097414
+ bl DWCi_SetBuddyFriendData
ldr r0, [r8]
strb sb, [r0, #0x1d]
b _021E1B30
@@ -10312,7 +10312,7 @@ _021E1C08:
ldr r1, [sl]
ldrb r2, [r1, #0x1c]
mla r1, r2, r8, r6
- bl FUN_02096DA0
+ bl DWC_GetGsProfileId
cmp r0, sb
bne _021E1C9C
bl MOD04_021E0F00
@@ -10322,7 +10322,7 @@ _021E1C08:
add r2, sp, #0x20
ldrb r3, [r3, #0x1c]
mla r1, r3, r1, r6
- bl FUN_02096C78
+ bl DWC_LoginIdToUserName
ldr r0, _021E1CC4 ; =0x022106D0
mov r1, #0
ldr r4, [r0]
@@ -10585,7 +10585,7 @@ MOD04_021E1F84: ; 0x021E1F84
bl MOD04_021E0F00
mov r1, #0xc
mla r1, r5, r1, r4
- bl FUN_02096DA0
+ bl DWC_GetGsProfileId
cmp r0, #0
beq _021E1FD4
mvn r1, #0
@@ -15142,7 +15142,7 @@ _021E5E50:
ldrb r2, [r2, #0x304]
mov r0, fp
mla r1, r2, r1, r3
- bl FUN_02096DA0
+ bl DWC_GetGsProfileId
movs sl, r0
beq _021E5DB4
mvn r0, #0
@@ -15159,7 +15159,7 @@ _021E5E50:
add r1, fp, r1
ldrb r1, [r1, #0x304]
mla r0, r1, r0, r2
- bl FUN_02097000
+ bl DWCi_Acc_IsValidFriendData
cmp r0, #0
beq _021E5DB4
mov r6, r7
@@ -17170,7 +17170,7 @@ MOD04_021E7B04: ; 0x021E7B04
mov r5, r4
b _021E7C48
_021E7BC0:
- bl FUN_0209A60C
+ bl SOC_GetHostID
mov r0, r0, lsl #0x10
ldr r1, _021E7DEC ; =0x0000FFFF
ldr r2, _021E7DF0 ; =0x0000A8C0
@@ -17220,7 +17220,7 @@ _021E7C48:
str r8, [r0, #0x19c]
b _021E7D00
_021E7C74:
- bl FUN_0209A60C
+ bl SOC_GetHostID
str r0, [sp, #8]
bl MOD04_021E26E4
ldr r0, [r0, #4]
@@ -21677,7 +21677,7 @@ MOD04_021EBA28: ; 0x021EBA28
blo _021EBAB0
cmp r0, #0x10
bhi _021EBAB0
- bl FUN_020A8850
+ bl WCM_GetApMacAddress
mov r4, r0
mov r1, #6
bl DC_InvalidateRange
@@ -21692,7 +21692,7 @@ MOD04_021EBA28: ; 0x021EBA28
cmp r0, #4
bne _021EBAA8
mov r0, #0
- bl FUN_020A87E0
+ bl WCM_GetApEssid
mov r4, r0
mov r1, #0x20
bl DC_InvalidateRange
@@ -21924,11 +21924,11 @@ MOD04_021EBC60: ; 0x021EBC60
and r1, r1, #3
orr r1, r2, r1, lsl #4
strb r1, [r0, #0xd0c]
- bl FUN_02095FA8
+ bl DWCi_BM_GetApInfo
ldr r0, _021EBE14 ; =0x02210E4C
mov r1, #0x2300
ldr r0, [r0]
- bl FUN_020A7E80
+ bl WCM_Init
cmp r0, #1
beq _021EBDF4
cmp r0, #4
@@ -22664,7 +22664,7 @@ _021EC7AC: .word 0x00000D0C
MOD04_021EC7B0: ; 0x021EC7B0
stmdb sp!, {r4, r5, r6, lr}
mov r6, r0
- bl FUN_020A71F8
+ bl WCM_GetPhase
ldrb r2, [r6, #0xd13]
add r3, r6, #0x470
mov r1, #0xc0
@@ -22731,7 +22731,7 @@ _021EC898:
mov r0, r5
add r1, r6, r1
orr r2, r4, r2
- bl FUN_020A75C0
+ bl WCM_ConnectAsync
b _021EC8E0
_021EC8BC:
cmp r0, #9
@@ -22854,12 +22854,12 @@ _021ECA44:
MOD04_021ECA4C: ; 0x021ECA4C
stmdb sp!, {lr}
sub sp, sp, #4
- bl FUN_02099A94
+ bl SOCL_CalmDown
cmp r0, #0
addne sp, sp, #4
movne r0, #0
ldmneia sp!, {pc}
- bl THUNK_FUN_02099BC8
+ bl SOC_Cleanup
cmp r0, #0
beq _021ECA80
mvn r1, #0x26
@@ -22878,7 +22878,7 @@ _021ECA8C:
MOD04_021ECA98: ; 0x021ECA98
stmdb sp!, {lr}
sub sp, sp, #4
- bl FUN_020A71F8
+ bl WCM_GetPhase
cmp r0, #0xc
addls pc, pc, r0, lsl #2
b _021ECB2C
@@ -22901,19 +22901,19 @@ _021ECAE4:
mov r0, #1
ldmfd sp!, {pc}
_021ECAF0:
- bl FUN_020A7E0C
+ bl WCM_Finish
b _021ECB2C
_021ECAF8:
- bl FUN_020A7AC8
+ bl WCM_CleanupAsync
b _021ECB2C
_021ECB00:
- bl FUN_020A7820
+ bl WCM_EndSearchAsync
b _021ECB2C
_021ECB08:
- bl FUN_020A7488
+ bl WCM_DisconnectAsync
b _021ECB2C
_021ECB10:
- bl FUN_020A722C
+ bl WCM_TerminateAsync
b _021ECB2C
_021ECB18:
mov r0, #0
@@ -23463,7 +23463,7 @@ MOD04_021ED218: ; 0x021ED218
bl MOD04_021EB798
mov r4, r0
mov r5, #9
- bl FUN_020A71F8
+ bl WCM_GetPhase
cmp r0, #0xc
addls pc, pc, r0, lsl #2
b _021ED2F0
@@ -23503,13 +23503,13 @@ _021ED2A4:
bl MOD04_021ED8D4
b _021ED2F0
_021ED2C0:
- bl FUN_020A7820
+ bl WCM_EndSearchAsync
b _021ED2F0
_021ED2C8:
- bl FUN_020A7488
+ bl WCM_DisconnectAsync
b _021ED2F0
_021ED2D0:
- bl FUN_020A722C
+ bl WCM_TerminateAsync
mov r0, #4
bl MOD04_021EB6F4
mov r5, #0x11
@@ -23532,7 +23532,7 @@ MOD04_021ED2FC: ; 0x021ED2FC
movgt r2, #0xc
ldr r2, [ip, r2, lsl #2]
orr r2, r3, r2
- bl FUN_020A7A90
+ bl WCM_SearchAsync
add sp, sp, #4
ldmfd sp!, {pc}
.align 2, 0
@@ -23623,7 +23623,7 @@ _021ED410:
ldmloia sp!, {r4, r5, pc}
_021ED448:
strb r2, [r5, #0xd13]
- bl FUN_020A7820
+ bl WCM_EndSearchAsync
cmp r0, #1
strneb r4, [r5, #0xd0e]
movne r4, #7
@@ -24080,7 +24080,7 @@ MOD04_021EDA70: ; 0x021EDA70
mov r5, r0
bl MOD04_021EB720
mov r4, r0
- bl FUN_020A71F8
+ bl WCM_GetPhase
cmp r4, #2
bne _021EDAB0
cmp r0, #3
@@ -24137,7 +24137,7 @@ _021EDB38:
MOD04_021EDB44: ; 0x021EDB44
stmdb sp!, {r4, lr}
sub sp, sp, #0x10
- bl FUN_020A71F8
+ bl WCM_GetPhase
mov r4, r0
mov r0, #0x10
bl MOD04_021EB798
@@ -24152,7 +24152,7 @@ MOD04_021EDB44: ; 0x021EDB44
bl MOD04_021ED17C
ldr r1, _021EDBC8 ; =MOD04_021EC44C
add r0, sp, #0
- bl FUN_020A7BD4
+ bl WCM_StartupAsync
cmp r0, #1
beq _021EDB9C
cmp r0, #4
@@ -24207,7 +24207,7 @@ MOD04_021EDBCC: ; 0x021EDBCC
str r0, [sp, #4]
add r0, sp, #0
add r1, sp, #4
- bl FUN_0209A594
+ bl SOC_GetResolver
add sp, sp, #8
ldmia sp!, {r4, pc}
@@ -24318,12 +24318,12 @@ _021EDDB8: .word 0x0220BB2C
MOD04_021EDDBC: ; 0x021EDDBC
stmdb sp!, {lr}
sub sp, sp, #4
- bl FUN_02099A94
+ bl SOCL_CalmDown
cmp r0, #0
addne sp, sp, #4
movne r0, #0xb
ldmneia sp!, {pc}
- bl THUNK_FUN_02099BC8
+ bl SOC_Cleanup
cmp r0, #0
beq _021EDDF0
mvn r1, #0x26
@@ -24401,7 +24401,7 @@ MOD04_021EDE90: ; 0x021EDE90
MOD04_021EDEC8: ; 0x021EDEC8
stmdb sp!, {r4, lr}
mov r4, r0
- bl FUN_0209A60C
+ bl SOC_GetHostID
cmp r0, #0
beq _021EDF00
mov r0, r4
@@ -24456,7 +24456,7 @@ MOD04_021EDF58: ; 0x021EDF58
mov r2, #4
mov r0, r4
str r2, [r1]
- bl FUN_0209A2C0
+ bl SOC_Startup
cmp r0, #0
moveq r0, #0xc
ldmeqia sp!, {r4, r5, r6, pc}
@@ -24476,7 +24476,7 @@ MOD04_021EDFBC: ; 0x021EDFBC
mov r0, #0x10
bl MOD04_021EB798
mov r4, r0
- bl FUN_020A71F8
+ bl WCM_GetPhase
cmp r0, #9
bne _021EE064
sub r0, r5, #0xa
@@ -25236,7 +25236,7 @@ MOD04_021EE9E0: ; 0x021EE9E0
cmp r1, r0
bne _021EEA58
mov r0, r5
- bl FUN_0209A6EC
+ bl SOC_GetHostByAddr
cmp r0, #0
addeq sp, sp, #4
moveq r0, #0
@@ -26272,14 +26272,14 @@ MOD04_021EF794: ; 0x021EF794
add r0, sp, #0x10
mov r5, r1
mov r4, r2
- bl FUN_020A8BBC
+ bl MD5Init
add r0, sp, #0x10
mov r1, r6
mov r2, r5
- bl FUN_020A8BB0
+ bl MD5Update
add r0, sp, #0
add r1, sp, #0x10
- bl FUN_020A8BA4
+ bl MD5Final
add r0, sp, #0
mov r1, r4
bl MOD04_021EF7E0
@@ -26554,7 +26554,7 @@ MOD04_021EFB38: ; 0x021EFB38
stmdb sp!, {lr}
sub sp, sp, #4
add r1, sp, #0
- bl FUN_0209A224
+ bl SOC_InetAtoN
cmp r0, #0
mvneq r0, #0
ldrne r0, [sp]
@@ -26569,7 +26569,7 @@ MOD04_021EFB5C: ; 0x021EFB5C
ldr r2, [r4]
mov r5, r1
strb r2, [r5]
- bl FUN_0209A650
+ bl SOC_GetSockName
ldrb r2, [r5]
mvn r1, #0
str r2, [r4]
@@ -26619,7 +26619,7 @@ _021EFBE8:
add ip, sp, #4
strb lr, [sp, #4]
str ip, [sp]
- bl FUN_0209A7D0
+ bl SOC_SendTo
mvn r1, #0
bl MOD04_021EFDD4
add sp, sp, #0x10
@@ -26629,7 +26629,7 @@ _021EFBE8:
MOD04_021EFC24: ; 0x021EFC24
stmdb sp!, {lr}
sub sp, sp, #4
- bl FUN_0209A858
+ bl SOC_Send
mvn r1, #0
bl MOD04_021EFDD4
add sp, sp, #4
@@ -26644,7 +26644,7 @@ MOD04_021EFC40: ; 0x021EFC40
ldr ip, [r4]
strb ip, [r5]
str r5, [sp]
- bl FUN_0209A880
+ bl SOC_RecvFrom
ldrb r2, [r5]
mvn r1, #0
str r2, [r4]
@@ -26656,7 +26656,7 @@ MOD04_021EFC40: ; 0x021EFC40
MOD04_021EFC78: ; 0x021EFC78
stmdb sp!, {lr}
sub sp, sp, #4
- bl FUN_0209A91C
+ bl SOC_Read
mvn r1, #0
bl MOD04_021EFDD4
add sp, sp, #4
@@ -26670,7 +26670,7 @@ MOD04_021EFC94: ; 0x021EFC94
ldr r2, [r4]
mov r5, r1
strb r2, [r5]
- bl FUN_0209A504
+ bl SOC_Accept
ldrb r2, [r5]
mvn r1, #0
str r2, [r4]
@@ -26682,7 +26682,7 @@ MOD04_021EFC94: ; 0x021EFC94
MOD04_021EFCC8: ; 0x021EFCC8
stmdb sp!, {lr}
sub sp, sp, #4
- bl FUN_0209A588
+ bl SOC_Listen
mvn r1, #0
bl MOD04_021EFDD4
add sp, sp, #4
@@ -26703,7 +26703,7 @@ _021EFCF4:
bne _021EFCF4
add r1, sp, #0
strb r2, [sp]
- bl FUN_0209A944
+ bl SOC_Connect
mvn r1, #0
bl MOD04_021EFDD4
add sp, sp, #8
@@ -26729,7 +26729,7 @@ _021EFD4C:
bne _021EFD4C
add r1, sp, #0
strb r2, [sp]
- bl FUN_0209A9A4
+ bl SOC_Bind
mvn r1, #0
bl MOD04_021EFDD4
add sp, sp, #8
@@ -26739,7 +26739,7 @@ _021EFD4C:
MOD04_021EFD80: ; 0x021EFD80
stmdb sp!, {lr}
sub sp, sp, #4
- bl thunk_FUN_020995dc
+ bl SOC_Shutdown
mvn r1, #0
bl MOD04_021EFDD4
add sp, sp, #4
@@ -26749,7 +26749,7 @@ MOD04_021EFD80: ; 0x021EFD80
MOD04_021EFD9C: ; 0x021EFD9C
stmdb sp!, {lr}
sub sp, sp, #4
- bl thunk_FUN_0209996c
+ bl SOC_Close
mvn r1, #0
bl MOD04_021EFDD4
add sp, sp, #4
@@ -26759,7 +26759,7 @@ MOD04_021EFD9C: ; 0x021EFD9C
MOD04_021EFDB8: ; 0x021EFDB8
stmdb sp!, {lr}
sub sp, sp, #4
- bl FUN_0209A9D0
+ bl SOC_Socket
mvn r1, #0
bl MOD04_021EFDD4
add sp, sp, #4
@@ -26829,9 +26829,9 @@ MOD04_021EFE70: ; 0x021EFE70
strh r3, [r1, #0xa]
str r2, [r1, #0xc]
str r3, [r0]
- bl FUN_02099C78
+ bl SOCL_GetHostID
ldr r1, _021EFEF8 ; =0x02210F50
- bl FUN_0209A174
+ bl SOC_U32to4U8
ldr r2, _021EFEF8 ; =0x02210F50
ldr r0, [r2]
cmp r0, #0
@@ -26904,7 +26904,7 @@ MOD04_021EFF5C: ; 0x021EFF5C
add r0, sp, #0
mov r1, #1
strh r2, [sp, #6]
- bl FUN_0209A0AC
+ bl SOC_Poll
cmp r0, #0
addlt sp, sp, #8
mvnlt r0, #0
@@ -27050,13 +27050,13 @@ MOD04_021F017C: ; 0x021F017C
mov r1, #3
mov r2, #0
mov r5, r0
- bl FUN_0209A4B4
+ bl SOC_Fcntl
cmp r4, #0
bicne r2, r0, #4
orreq r2, r0, #4
mov r0, r5
mov r1, #4
- bl FUN_0209A4B4
+ bl SOC_Fcntl
cmp r0, #0
moveq r0, #1
movne r0, #0
@@ -32277,7 +32277,7 @@ _021F4AD0:
ldmia sp!, {r4, r5, r6, pc}
_021F4B0C:
ldr r0, _021F4C30 ; =0x0220DD90
- bl FUN_0209A6EC
+ bl SOC_GetHostByAddr
cmp r0, #0
bne _021F4B48
ldr r2, _021F4C34 ; =0x0220E144
@@ -39046,7 +39046,7 @@ _021FAB54:
ldmia sp!, {r4, r5, r6, pc}
_021FAB90:
ldr r0, _021FACA8 ; =0x0220E860
- bl FUN_0209A6EC
+ bl SOC_GetHostByAddr
cmp r0, #0
bne _021FABCC
ldr r2, _021FACAC ; =0x0220EBC4
@@ -45132,7 +45132,7 @@ _021FFE40:
cmp r5, r0
bne _021FFE84
mov r0, r8
- bl FUN_0209A6EC
+ bl SOC_GetHostByAddr
cmp r0, #0
addeq sp, sp, #0x104
moveq r0, #0
@@ -45176,7 +45176,7 @@ _021FFEE0:
beq _021FFF18
add r0, sp, #0
ldmia r0, {r0}
- bl FUN_0209A27C
+ bl SOC_InetNtoA
mov r2, r0
ldr r1, _021FFF6C ; =0x0220F008
mov r0, r5
@@ -45186,7 +45186,7 @@ _021FFEE0:
_021FFF18:
add r0, sp, #0
ldmia r0, {r0}
- bl FUN_0209A27C
+ bl SOC_InetNtoA
mov r2, r0
ldr r1, _021FFF70 ; =0x0220F010
mov r0, r5
@@ -45879,7 +45879,7 @@ MOD04_022008A0: ; 0x022008A0
cmp r0, r1
ldmneia sp!, {r4, pc}
mov r0, r4
- bl FUN_0209A6EC
+ bl SOC_GetHostByAddr
cmp r0, #0
moveq r0, #0
ldrne r0, [r0, #0xc]
@@ -46381,7 +46381,7 @@ _02200F8C:
bl MOD04_022021C0
add r0, r5, r8, lsl #2
ldmia r0, {r0}
- bl FUN_0209A27C
+ bl SOC_InetNtoA
mov r1, r0
mov r0, r6
bl MOD04_022021C0
@@ -47603,7 +47603,7 @@ _022020D0:
cmp r0, #0
beq _0220211C
mov r0, r7
- bl FUN_0209A6EC
+ bl SOC_GetHostByAddr
movs r4, r0
addeq sp, sp, #4
moveq r0, #0
@@ -52308,7 +52308,7 @@ _02206038:
cmp r0, r1
bne _022060A4
add r0, sp, #8
- bl FUN_0209A6EC
+ bl SOC_GetHostByAddr
cmp r0, #0
addeq sp, sp, #0x88
moveq r0, #2
@@ -53611,7 +53611,7 @@ MOD04_022071C0: ; 0x022071C0
mov r1, #0x14
bl MOD04_022083B4
add r0, sp, #0
- bl FUN_02095EC8
+ bl DWCi_BM_GetWiFiInfo
ldr r1, [sp]
ldr r2, [sp, #4]
mov r0, #0
@@ -56591,12 +56591,12 @@ MOD04_022099C0: ; 0x022099C0
moveq r2, #7
add r6, r0, r2
mov r0, r6
- bl FUN_0209A224
+ bl SOC_InetAtoN
cmp r0, #0
ldrne r0, [sp]
bne _02209A54
mov r0, r6
- bl FUN_02099D88
+ bl SOCL_Resolve
cmp r0, #0
addeq sp, sp, #8
moveq r0, #0
@@ -56837,7 +56837,7 @@ MOD04_02209D40: ; 0x02209D40
ldmltia sp!, {pc}
mov r0, r1
mov r1, #2
- bl thunk_FUN_020995dc
+ bl SOC_Shutdown
add sp, sp, #4
ldmfd sp!, {pc}
@@ -56849,7 +56849,7 @@ MOD04_02209D68: ; 0x02209D68
mov r1, r2
mov r2, r3
ldr r3, [sp, #8]
- bl FUN_0209A858
+ bl SOC_Send
cmp r0, #0
ldmgeia sp!, {r4, pc}
ldr r1, [r4, #4]
@@ -56872,7 +56872,7 @@ MOD04_02209DB4: ; 0x02209DB4
mov r1, r2
mov r2, r3
ldr r3, [sp, #8]
- bl FUN_0209A91C
+ bl SOC_Read
cmp r0, #0
ldmgeia sp!, {r4, pc}
ldr r1, [r4, #4]
@@ -56907,7 +56907,7 @@ MOD04_02209E00: ; 0x02209E00
strb lr, [sp, #1]
strh r3, [sp, #2]
str r2, [sp, #4]
- bl FUN_0209A944
+ bl SOC_Connect
cmp r0, #0
bge _02209E6C
ldr r0, [r4, #4]
@@ -56928,7 +56928,7 @@ MOD04_02209E7C: ; 0x02209E7C
stmdb sp!, {r4, r5, r6, r7, r8, lr}
mov r8, r1
mov r0, r8
- bl thunk_FUN_0209996c
+ bl SOC_Close
cmp r0, #0
ldmneia sp!, {r4, r5, r6, r7, r8, pc}
mov r7, #0
@@ -56942,7 +56942,7 @@ _02209EA8:
add r7, r7, #0x1f4
_02209EB4:
mov r0, r8
- bl thunk_FUN_0209996c
+ bl SOC_Close
cmp r0, r5
ldmneia sp!, {r4, r5, r6, r7, r8, pc}
cmp r7, r4
@@ -56959,7 +56959,7 @@ MOD04_02209ED4: ; 0x02209ED4
mov r0, #2
mov r1, #1
mov r2, #0
- bl FUN_0209A9D0
+ bl SOC_Socket
movs r4, r0
bmi _02209F4C
ldr r0, [r5, #8]
@@ -56977,11 +56977,11 @@ MOD04_02209ED4: ; 0x02209ED4
ldr r1, [r5, #0x20]
str r2, [r1, #0x810]
ldr r1, [r5, #0x20]
- bl FUN_0209AAD0
+ bl SOCL_EnableSsl
cmp r0, #0
bge _02209F4C
mov r0, r4
- bl thunk_FUN_0209996c
+ bl SOC_Close
mvn r4, #0
_02209F4C:
mov r0, r4
@@ -56998,7 +56998,7 @@ MOD04_02209F5C: ; 0x02209F5C
bl OS_GetLowEntropyData
ldr r0, _02209F80 ; =0x02211A24
mov r1, #0x20
- bl FUN_020A136C
+ bl CPS_SslAddRandomSeed
add sp, sp, #4
ldmfd sp!, {pc}
.align 2, 0
diff --git a/arm9/modules/04/asm/thumb_04.s b/arm9/modules/04/asm/thumb_04.s
index d10d80bb..7c6a31fc 100644
--- a/arm9/modules/04/asm/thumb_04.s
+++ b/arm9/modules/04/asm/thumb_04.s
@@ -159,7 +159,7 @@ _021D7608:
ldr r1, [r0]
ldr r0, _021D7658 ; =0x00001EF0
ldr r0, [r1, r0]
- bl FUN_02096F80
+ bl DWC_CheckHasProfile
cmp r0, #0
bne _021D762C
mov r0, #1
@@ -169,7 +169,7 @@ _021D762C:
ldr r1, [r0]
ldr r0, _021D7658 ; =0x00001EF0
ldr r0, [r1, r0]
- bl FUN_02096F18
+ bl DWC_CheckValidConsole
cmp r0, #0
beq _021D7640
mov r0, #0
@@ -719,14 +719,14 @@ MOD04_021D7A7C: ; 0x021D7A7C
ldr r1, [r0]
ldr r0, _021D7AFC ; =0x00001EF0
ldr r0, [r1, r0]
- bl FUN_02096EB4
+ bl DWC_CheckDirtyFlag
cmp r0, #0
beq _021D7AB0
ldr r0, _021D7AF8 ; =0x0220FBC0
ldr r1, [r0]
ldr r0, _021D7AFC ; =0x00001EF0
ldr r0, [r1, r0]
- bl thunk_FUN_02096e4c
+ bl DWC_ClearDirtyFlag
ldr r0, _021D7AF8 ; =0x0220FBC0
ldr r1, [r0]
mov r0, #0x1f
@@ -1979,7 +1979,7 @@ _021D8400:
lsl r1, r1, #8
ldr r0, [r0, r1]
add r0, r0, r4
- bl FUN_02097490
+ bl DWC_IsBuddyFriendData
cmp r0, #0
beq _021D844A
mov r0, #0x11
@@ -2192,7 +2192,7 @@ MOD04_021D85B4: ; 0x021D85B4
ldr r1, [r0]
ldr r0, _021D8618 ; =0x00001EF0
ldr r0, [r1, r0]
- bl FUN_02096F80
+ bl DWC_CheckHasProfile
cmp r0, #0
bne _021D85D8
ldr r0, _021D8614 ; =0x0220FBC0
@@ -2200,7 +2200,7 @@ MOD04_021D85B4: ; 0x021D85B4
ldr r0, _021D8618 ; =0x00001EF0
ldr r0, [r1, r0]
add r1, sp, #0xc
- bl FUN_02096CCC
+ bl DWC_CreateExchangeToken
b _021D85E6
_021D85D8:
ldr r0, _021D8614 ; =0x0220FBC0
@@ -2208,7 +2208,7 @@ _021D85D8:
ldr r0, _021D8618 ; =0x00001EF0
ldr r0, [r1, r0]
add r1, sp, #0
- bl FUN_02096CCC
+ bl DWC_CreateExchangeToken
_021D85E6:
mov r4, #0
mov r7, #0x11
@@ -2221,11 +2221,11 @@ _021D85F0:
lsl r0, r0, #8
ldr r0, [r1, r0]
add r0, r0, r5
- bl FUN_02097484
+ bl DWC_GetFriendDataType
ldr r0, [r6]
ldr r0, [r0, r7]
add r0, r0, r5
- bl FUN_02097490
+ bl DWC_IsBuddyFriendData
add r4, r4, #1
add r5, #0xc
cmp r4, #0x20
@@ -2673,7 +2673,7 @@ _021D8976:
ldr r0, _021D8A3C ; =0x0220FBC8
str r4, [r0, #0xc]
str r5, [r0, #0x10]
- bl FUN_020AD8A8
+ bl VCT_Main
ldr r4, _021D8A3C ; =0x0220FBC8
ldr r0, _021D8A44 ; =0x0000411A
ldr r1, [r4, #8]
@@ -2682,7 +2682,7 @@ _021D8976:
add r6, r0, #0
add r5, r0, #0
_021D898E:
- bl FUN_020AD8A8
+ bl VCT_Main
ldr r0, [r4, #8]
sub r0, r0, r6
str r0, [r4, #8]
@@ -2791,7 +2791,7 @@ MOD04_021D8A54: ; 0x021D8A54
_021D8A62:
lsl r0, r0, #0x18
lsr r0, r0, #0x18
- bl FUN_020AD834
+ bl VCT_HandleData
cmp r0, #0
beq _021D8A72
mov r0, #1
@@ -2946,7 +2946,7 @@ _021D8ACA:
lsl r0, r0, #6
str r0, [sp, #0x28]
add r0, sp, #0x14
- bl FUN_020AD93C
+ bl VCT_Init
cmp r0, #0
ldr r0, _021D8BCC ; =0x0220FBC8
add r2, r5, #0
@@ -3058,7 +3058,7 @@ MOD04_021D8C6C: ; 0x021D8C6C
ldr r0, _021D8CC4 ; =0x00003504
add r0, r1, r0
bl FUN_020C1674
- bl FUN_020AD904
+ bl VCT_Cleanup
ldr r1, _021D8CBC ; =0x0220FBC8
mov r0, #0x35
ldr r2, [r1, #4]
diff --git a/arm9/modules/13/asm/module_13_arm2.s b/arm9/modules/13/asm/module_13_arm2.s
index 6245d91c..b0291130 100644
--- a/arm9/modules/13/asm/module_13_arm2.s
+++ b/arm9/modules/13/asm/module_13_arm2.s
@@ -5713,7 +5713,7 @@ _0222338C:
mov r1, #0x20
bl MOD13_0223B004
str r0, [sp]
- bl FUN_02096190
+ bl DWC_BM_Init
add r0, sp, #0
bl MOD13_0223AF90
add sp, sp, #4
@@ -7885,7 +7885,7 @@ MOD13_02224FEC: ; 0x02224FEC
mov r0, fp
bl MOD13_0223A4F0
add r0, sp, #0x1c
- bl FUN_02095EC8
+ bl DWCi_BM_GetWiFiInfo
ldr sb, [sp, #0x1c]
ldr sl, [sp, #0x20]
mov r3, #0
@@ -8250,7 +8250,7 @@ _02225578:
b _022255E4
_02225584:
add r0, sp, #0
- bl FUN_02095EC8
+ bl DWCi_BM_GetWiFiInfo
ldr r0, _022255F4 ; =0x0224308C
ldrb r0, [r0]
cmp r0, #0
@@ -8485,7 +8485,7 @@ _02225844:
bl MOD13_022393D8
mov r5, r0
add r0, sp, #0x30
- bl FUN_02095EC8
+ bl DWCi_BM_GetWiFiInfo
ldr r1, [sp, #0x30]
ldr r0, [sp, #0x34]
mov r6, #0
@@ -14113,7 +14113,7 @@ _0222A464:
ldmia sp!, {r4, r5, r6, r7, r8, pc}
_0222A48C:
add r0, sp, #8
- bl FUN_02095AE0
+ bl DWC_BACKUPlCheckAddress
cmp r0, #0
movne r0, #1
moveq r0, #0
@@ -15568,11 +15568,11 @@ MOD13_0222B87C: ; 0x0222B87C
cmp r0, #0
bne _0222B8C8
add r0, r4, #0xc8
- bl FUN_02095AE0
+ bl DWC_BACKUPlCheckAddress
cmp r0, #0
bne _0222B8C8
add r0, r4, #0xcc
- bl FUN_02095AE0
+ bl DWC_BACKUPlCheckAddress
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
@@ -15581,18 +15581,18 @@ _0222B8C8:
cmp r0, #0
bne _0222B914
add r0, r4, #0xc0
- bl FUN_02095AE0
+ bl DWC_BACKUPlCheckAddress
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
add r0, r4, #0xc4
- bl FUN_02095AE0
+ bl DWC_BACKUPlCheckAddress
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
add r0, r4, #0xc0
add r1, r4, #0xf0
- bl FUN_02095B0C
+ bl DWC_BACKUPlCheckIp
cmp r0, #0
moveq r0, #0
ldmeqia sp!, {r4, pc}
@@ -17255,7 +17255,7 @@ _0222D02C:
bl MOD13_02234164
mov r4, r0
add r0, r4, #0xf0
- bl FUN_02095BE0
+ bl DWCi_BACKUPlConvMaskCidr
strb r0, [r4, #0xd0]
ldrb r0, [r4, #0xf5]
cmp r0, #0
@@ -21999,11 +21999,11 @@ MOD13_02231090: ; 0x02231090
bl MOD04_021EB9D8
cmp r0, #0
ldmeqia sp!, {r4, pc}
- bl FUN_02095324
+ bl DWCi_BACKUPlGetWifi
add r1, r4, #0xf0
mov r2, #0xe
bl MI_CpuCopy8
- bl FUN_02095324
+ bl DWCi_BACKUPlGetWifi
add r1, r4, #0x1f0
mov r2, #0xe
bl MI_CpuCopy8
@@ -24971,7 +24971,7 @@ _022337BC:
add r1, sp, #4
ldr r0, [r0]
str r2, [sp]
- bl FUN_02095CDC
+ bl DWCi_BACKUPlWritePage
add r0, sp, #0
bl MOD13_0223AF90
add sp, sp, #0x14
@@ -25000,9 +25000,9 @@ _02233830:
cmp r3, #3
blt _02233830
add r0, sp, #0
- bl FUN_020967A4
+ bl DWCi_AUTH_GetNewWiFiInfo
add r0, sp, #0
- bl FUN_02095330
+ bl DWCi_BACKUPlConvWifiInfo
mov r6, #0
ldr r4, _022338B4 ; =0x02243150
mov r8, r0
@@ -25257,7 +25257,7 @@ _02233BB4:
mov r2, #4
bl MI_CpuCopy8
add r0, r5, #0xf0
- bl FUN_02095BE0
+ bl DWCi_BACKUPlConvMaskCidr
strb r0, [r4, #0xd0]
_02233BE0:
ldrb r0, [r5, #0xf6]
@@ -25340,7 +25340,7 @@ _02233CE8:
ldrb r0, [r4, #0xd0]
ldr r1, [r1]
add r1, r1, #0x4f0
- bl FUN_02095BB0
+ bl DWCi_BACKUPlConvMaskAddr
add sp, sp, #4
ldmia sp!, {r4, r5, pc}
.align 2, 0
@@ -25734,7 +25734,7 @@ MOD13_0223418C: ; 0x0223418C
bl MATHi_CRC16InitTableRev
ldr r0, _022341D0 ; =0x02243150
ldr r0, [r0]
- bl FUN_02095D68
+ bl DWCi_BACKUPlRead
add sp, sp, #4
ldmia sp!, {pc}
.align 2, 0
@@ -31696,7 +31696,7 @@ MOD13_0223923C: ; 0x0223923C
ldr r0, _0223932C ; =0x0000064C
ldr r1, [r1]
add r0, r1, r0
- bl FUN_02095D68
+ bl DWCi_BACKUPlRead
bl OS_GetTick
bl MOD13_022338FC
ldr r1, _02239328 ; =0x0224318C
diff --git a/arm9/modules/13/asm/module_13_thumb.s b/arm9/modules/13/asm/module_13_thumb.s
index 5cb48aa3..51681246 100644
--- a/arm9/modules/13/asm/module_13_thumb.s
+++ b/arm9/modules/13/asm/module_13_thumb.s
@@ -215,7 +215,7 @@ MOD13_02217440: ; 0x02217440
ldr r4, [sp, #0x10]
strb r5, [r4]
str r4, [sp]
- bl FUN_0209A7D0
+ bl SOC_SendTo
add sp, #4
pop {r4, r5}
pop {r3}
@@ -250,7 +250,7 @@ MOD13_02217458: ; 0x02217458
add r0, sp, #0
mov r1, #1
add r3, r4, #0
- bl FUN_0209A0AC
+ bl SOC_Poll
add sp, #8
pop {r4, r5, r6}
pop {r3}
@@ -267,7 +267,7 @@ MOD13_022174A4: ; 0x022174A4
ldr r4, [sp, #0x10]
strb r5, [r4]
str r4, [sp]
- bl FUN_0209A880
+ bl SOC_RecvFrom
add sp, #4
pop {r4, r5}
pop {r3}
@@ -323,7 +323,7 @@ _022174FA:
MOD13_02217504: ; 0x02217504
push {lr}
sub sp, #4
- bl THUNK_FUN_02099BC8
+ bl SOC_Cleanup
cmp r0, #0
bge _0221751A
mov r0, #0
@@ -363,7 +363,7 @@ MOD13_02217530: ; 0x02217530
ldr r1, _0221758C ; =0x0223F7C8
str r0, [r1, #0x18]
add r0, r1, #0
- bl FUN_0209A2C0
+ bl SOC_Startup
cmp r0, #0
bge _0221756A
mov r0, #0
@@ -4941,7 +4941,7 @@ _0221994E:
ldr r2, [sp, #4]
ldr r2, [r2, #0x28]
bl MI_CpuCopy8
- bl FUN_020A84D8
+ bl WCM_ClearApList
mov r0, #0
ldr r1, [sp, #4]
add r1, r1, #4
@@ -5769,7 +5769,7 @@ MOD13_02219F54: ; 0x02219F54
ldr r0, _0221A030 ; =0x02241A60
ldr r0, [r0]
ldr r1, _0221A044 ; =0x00002300
- bl FUN_020A7E80
+ bl WCM_Init
cmp r0, #0
beq _02219FD4
add r0, r4, #0
@@ -5791,7 +5791,7 @@ _02219FDA:
ldr r0, _0221A02C ; =0x02241A68
ldr r0, [r0]
ldr r1, _0221A048 ; =MOD13_0221A3CC
- bl FUN_020A7BD4
+ bl WCM_StartupAsync
cmp r0, #3
beq _0221A000
add r0, r4, #0
@@ -5886,7 +5886,7 @@ _0221A0A8:
ldr r1, [r1]
ldr r2, _0221A0EC ; =0x02241A6C
ldr r2, [r2]
- bl FUN_020A75C0
+ bl WCM_ConnectAsync
cmp r0, #3
bne _0221A0DA
mov r1, #8
@@ -5922,7 +5922,7 @@ MOD13_0221A0FC: ; 0x0221A0FC
ldr r0, [r0]
cmp r0, #3
bne _0221A136
- bl FUN_020A7AC8
+ bl WCM_CleanupAsync
cmp r0, #3
beq _0221A122
add r0, r4, #0
@@ -5973,7 +5973,7 @@ MOD13_0221A164: ; 0x0221A164
ldr r0, [r0]
cmp r0, #7
bne _0221A190
- bl FUN_020A7488
+ bl WCM_DisconnectAsync
cmp r0, #3
bne _0221A190
mov r1, #4
@@ -6007,7 +6007,7 @@ MOD13_0221A1A4: ; 0x0221A1A4
mov r0, #0
add r1, r0, #0
add r2, r0, #0
- bl FUN_020A7A90
+ bl WCM_SearchAsync
cmp r0, #3
bne _0221A1D6
mov r1, #4
@@ -6121,7 +6121,7 @@ _0221A27C:
ldr r1, [r1]
ldr r2, _0221A2DC ; =0x02241A64
ldr r2, [r2]
- bl FUN_020A7A90
+ bl WCM_SearchAsync
cmp r0, #3
bne _0221A2CC
mov r1, #6
@@ -6173,8 +6173,8 @@ MOD13_0221A2FC: ; 0x0221A2FC
add r5, r0, #0
add r7, r1, #0
mov r0, #1
- bl FUN_020A83D0
- bl FUN_020A846C
+ bl WCM_LockApList
+ bl WCM_CountApList
add r6, r0, #0
cmp r6, #0
ble _0221A336
@@ -6186,7 +6186,7 @@ _0221A31A:
bge _0221A336
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- bl FUN_020A8358
+ bl WCM_PointApList
add r1, r5, #0
mov r2, #0xc0
bl MIi_CpuCopy32
@@ -6196,7 +6196,7 @@ _0221A31A:
blt _0221A31A
_0221A336:
mov r0, #0
- bl FUN_020A83D0
+ bl WCM_LockApList
add r0, r6, #0
add sp, #4
pop {r4, r5, r6, r7}
@@ -6233,7 +6233,7 @@ _0221A374:
mov r0, #0
add r1, r0, #0
add r2, r0, #0
- bl FUN_020A7A90
+ bl WCM_SearchAsync
cmp r0, #3
beq _0221A3B8
mov r0, #0
@@ -6241,7 +6241,7 @@ _0221A374:
pop {r3}
bx r3
_0221A38A:
- bl FUN_020A7488
+ bl WCM_DisconnectAsync
cmp r0, #3
beq _0221A3B8
mov r0, #0
@@ -6252,7 +6252,7 @@ _0221A39A:
ldr r0, _0221A3C4 ; =0x02241A68
ldr r0, [r0]
ldr r1, _0221A3C8 ; =MOD13_0221A3CC
- bl FUN_020A7BD4
+ bl WCM_StartupAsync
cmp r0, #3
beq _0221A3B8
mov r0, #0
@@ -6335,7 +6335,7 @@ _0221A426:
ldr r1, [r1]
ldr r2, _0221A768 ; =0x02241A64
ldr r2, [r2]
- bl FUN_020A7A90
+ bl WCM_SearchAsync
cmp r0, #3
bne _0221A440
b _0221A750
@@ -6366,7 +6366,7 @@ _0221A462:
ldr r1, [r1]
ldr r2, _0221A774 ; =0x02241A6C
ldr r2, [r2]
- bl FUN_020A75C0
+ bl WCM_ConnectAsync
cmp r0, #3
bne _0221A478
b _0221A750
@@ -6510,7 +6510,7 @@ _0221A55E:
ldr r1, [r1]
ldr r2, _0221A768 ; =0x02241A64
ldr r2, [r2]
- bl FUN_020A7A90
+ bl WCM_SearchAsync
cmp r0, #3
bne _0221A578
b _0221A750
@@ -6533,7 +6533,7 @@ _0221A588:
_0221A594:
cmp r2, #2
bne _0221A5BE
- bl FUN_020A7AC8
+ bl WCM_CleanupAsync
cmp r0, #3
bne _0221A5A2
b _0221A750
@@ -6564,7 +6564,7 @@ _0221A5C4:
ldr r1, [r1]
ldr r2, _0221A774 ; =0x02241A6C
ldr r2, [r2]
- bl FUN_020A75C0
+ bl WCM_ConnectAsync
cmp r0, #3
bne _0221A5DA
b _0221A750
@@ -6630,7 +6630,7 @@ _0221A638:
ldr r1, [r1]
ldr r2, _0221A768 ; =0x02241A64
ldr r2, [r2]
- bl FUN_020A7A90
+ bl WCM_SearchAsync
cmp r0, #3
beq _0221A750
mov r1, #3
@@ -6649,7 +6649,7 @@ _0221A638:
_0221A66A:
cmp r2, #2
bne _0221A690
- bl FUN_020A7AC8
+ bl WCM_CleanupAsync
cmp r0, #3
beq _0221A750
mov r1, #3
@@ -6674,7 +6674,7 @@ _0221A690:
ldr r1, [r1]
ldr r2, _0221A774 ; =0x02241A6C
ldr r2, [r2]
- bl FUN_020A75C0
+ bl WCM_ConnectAsync
cmp r0, #3
beq _0221A750
mov r1, #3
@@ -6718,7 +6718,7 @@ _0221A6E4:
ldr r0, [r0]
cmp r0, #2
bne _0221A750
- bl FUN_020A7E0C
+ bl WCM_Finish
mov r1, #0
ldr r0, _0221A758 ; =0x02241A78
str r1, [r0]
@@ -10807,7 +10807,7 @@ _0221C6FC:
mov r0, #2
lsl r1, r0, #0
ldr r2, [sp, #0x10]
- bl FUN_0209A9D0
+ bl SOC_Socket
add r4, r0, #0
cmp r4, #0
bge _0221C716
@@ -10831,7 +10831,7 @@ _0221C716:
ldr r1, [sp, #0x18]
str r1, [sp, #0x48]
add r1, sp, #0x44
- bl FUN_0209A9A4
+ bl SOC_Bind
str r0, [sp, #4]
cmp r0, #0
bge _0221C746
@@ -10851,7 +10851,7 @@ _0221C74C:
cmp r0, r1
blo _0221C768
add r0, r4, #0
- bl thunk_FUN_0209996c
+ bl SOC_Close
ldr r0, [sp, #0x1c]
str r0, [sp, #4]
mov r0, #1
@@ -10870,7 +10870,7 @@ _0221C768:
ldr r1, _0221C9F8 ; =0x022427E4
ldr r2, _0221C9FC ; =0x00000800
mov r3, #4
- bl FUN_0209A880
+ bl SOC_RecvFrom
cmp r0, #0
bgt _0221C78C
b _0221CA3C
@@ -10916,7 +10916,7 @@ _0221C7D8:
cmp r0, r1
blo _0221C7F4
add r0, r4, #0
- bl thunk_FUN_0209996c
+ bl SOC_Close
ldr r0, [sp, #0x20]
str r0, [sp, #4]
mov r0, #1
@@ -10929,7 +10929,7 @@ _0221C7F4:
ldr r1, _0221C9F8 ; =0x022427E4
ldr r2, _0221C9FC ; =0x00000800
mov r3, #4
- bl FUN_0209A880
+ bl SOC_RecvFrom
cmp r0, #0
ble _0221C86A
ldr r0, _0221C9F8 ; =0x022427E4
@@ -11042,7 +11042,7 @@ _0221C8DE:
ldr r1, _0221C9F8 ; =0x022427E4
ldr r2, _0221C9FC ; =0x00000800
mov r3, #4
- bl FUN_0209A880
+ bl SOC_RecvFrom
cmp r0, #0
ble _0221C932
ldr r0, _0221C9F8 ; =0x022427E4
@@ -11090,7 +11090,7 @@ _0221C932:
cmp r0, #0xa
blt _0221C95A
add r0, r4, #0
- bl thunk_FUN_0209996c
+ bl SOC_Close
ldr r0, [sp, #0x14]
str r0, [sp, #4]
mov r0, #1
@@ -11197,7 +11197,7 @@ _0221CA4C:
cmp r4, #0
beq _0221CA56
add r0, r4, #0
- bl thunk_FUN_0209996c
+ bl SOC_Close
_0221CA56:
ldr r0, _0221CA70 ; =0x02241AC0
ldr r0, [r0]
@@ -12531,9 +12531,9 @@ MOD13_0221D414: ; 0x0221D414
str r0, [sp, #8]
ldr r0, _0221D454 ; =0x000001E6
strh r0, [r1, #2]
- bl FUN_02099C78
+ bl SOCL_GetHostID
add r1, sp, #0xc
- bl FUN_0209A174
+ bl SOC_U32to4U8
str r4, [sp]
add r0, r5, #0
add r1, sp, #4
@@ -12555,7 +12555,7 @@ MOD13_0221D458: ; 0x0221D458
add r1, r3, #0
ldr r2, [sp, #8]
mov r3, #0
- bl FUN_0209A7D0
+ bl SOC_SendTo
cmp r0, #0
bge _0221D470
mov r0, #3
@@ -13228,7 +13228,7 @@ _0221D982:
beq _0221D992
mov r1, #0
str r1, [r0]
- bl THUNK_FUN_02099BC8
+ bl SOC_Cleanup
_0221D992:
pop {r4, r5, r6}
pop {r3}
@@ -13379,7 +13379,7 @@ _0221DA9A:
ldr r0, _0221DAE8 ; =0x02241AD0
str r1, [r0]
ldr r0, _0221DAEC ; =0x0223F8D4
- bl FUN_0209A2C0
+ bl SOC_Startup
cmp r0, #0
bge _0221DABC
mov r0, #1
@@ -13768,7 +13768,7 @@ MOD13_0221DD4C: ; 0x0221DD4C
ldr r0, _0221DE28 ; =0x02241AEC
ldr r0, [r0]
ldr r1, _0221DE3C ; =0x00002300
- bl FUN_020A7E80
+ bl WCM_Init
cmp r0, #0
beq _0221DDCC
add r0, r4, #0
@@ -13790,7 +13790,7 @@ _0221DDD2:
ldr r0, _0221DE24 ; =0x02241AB8
ldr r0, [r0]
ldr r1, _0221DE40 ; =MOD13_0221E178
- bl FUN_020A7BD4
+ bl WCM_StartupAsync
cmp r0, #3
beq _0221DDF8
add r0, r4, #0
@@ -13885,7 +13885,7 @@ _0221DEA0:
ldr r1, [r1]
ldr r2, _0221DEE4 ; =0x02241B08
ldr r2, [r2]
- bl FUN_020A75C0
+ bl WCM_ConnectAsync
cmp r0, #3
bne _0221DED2
mov r1, #8
@@ -13921,7 +13921,7 @@ MOD13_0221DEF4: ; 0x0221DEF4
ldr r0, [r0]
cmp r0, #3
bne _0221DF2E
- bl FUN_020A7AC8
+ bl WCM_CleanupAsync
cmp r0, #3
beq _0221DF1A
add r0, r4, #0
@@ -13972,7 +13972,7 @@ MOD13_0221DF5C: ; 0x0221DF5C
ldr r0, [r0]
cmp r0, #7
bne _0221DF88
- bl FUN_020A7488
+ bl WCM_DisconnectAsync
cmp r0, #3
bne _0221DF88
mov r1, #4
@@ -14081,7 +14081,7 @@ _0221E02A:
ldr r1, [r1]
ldr r2, _0221E088 ; =0x02241B10
ldr r2, [r2]
- bl FUN_020A7A90
+ bl WCM_SearchAsync
cmp r0, #3
bne _0221E078
mov r1, #6
@@ -14133,8 +14133,8 @@ MOD13_0221E0A8: ; 0x0221E0A8
add r5, r0, #0
add r7, r1, #0
mov r0, #1
- bl FUN_020A83D0
- bl FUN_020A846C
+ bl WCM_LockApList
+ bl WCM_CountApList
add r6, r0, #0
cmp r6, #0
ble _0221E0E2
@@ -14146,7 +14146,7 @@ _0221E0C6:
bge _0221E0E2
lsl r0, r4, #0x10
lsr r0, r0, #0x10
- bl FUN_020A8358
+ bl WCM_PointApList
add r1, r5, #0
mov r2, #0xc0
bl MIi_CpuCopy32
@@ -14156,7 +14156,7 @@ _0221E0C6:
blt _0221E0C6
_0221E0E2:
mov r0, #0
- bl FUN_020A83D0
+ bl WCM_LockApList
add r0, r6, #0
add sp, #4
pop {r4, r5, r6, r7}
@@ -14193,7 +14193,7 @@ _0221E120:
mov r0, #0
add r1, r0, #0
add r2, r0, #0
- bl FUN_020A7A90
+ bl WCM_SearchAsync
cmp r0, #3
beq _0221E164
mov r0, #0
@@ -14201,7 +14201,7 @@ _0221E120:
pop {r3}
bx r3
_0221E136:
- bl FUN_020A7488
+ bl WCM_DisconnectAsync
cmp r0, #3
beq _0221E164
mov r0, #0
@@ -14212,7 +14212,7 @@ _0221E146:
ldr r0, _0221E170 ; =0x02241AB8
ldr r0, [r0]
ldr r1, _0221E174 ; =MOD13_0221E178
- bl FUN_020A7BD4
+ bl WCM_StartupAsync
cmp r0, #3
beq _0221E164
mov r0, #0
@@ -14297,7 +14297,7 @@ _0221E1D6:
ldr r1, [r1]
ldr r2, _0221E528 ; =0x02241B10
ldr r2, [r2]
- bl FUN_020A7A90
+ bl WCM_SearchAsync
cmp r0, #3
bne _0221E1F0
b _0221E556
@@ -14328,7 +14328,7 @@ _0221E212:
ldr r1, [r1]
ldr r2, _0221E534 ; =0x02241B08
ldr r2, [r2]
- bl FUN_020A75C0
+ bl WCM_ConnectAsync
cmp r0, #3
bne _0221E228
b _0221E556
@@ -14472,7 +14472,7 @@ _0221E30E:
ldr r1, [r1]
ldr r2, _0221E528 ; =0x02241B10
ldr r2, [r2]
- bl FUN_020A7A90
+ bl WCM_SearchAsync
cmp r0, #3
bne _0221E328
b _0221E556
@@ -14495,7 +14495,7 @@ _0221E338:
_0221E344:
cmp r2, #2
bne _0221E36E
- bl FUN_020A7AC8
+ bl WCM_CleanupAsync
cmp r0, #3
bne _0221E352
b _0221E556
@@ -14526,7 +14526,7 @@ _0221E374:
ldr r1, [r1]
ldr r2, _0221E534 ; =0x02241B08
ldr r2, [r2]
- bl FUN_020A75C0
+ bl WCM_ConnectAsync
cmp r0, #3
bne _0221E38A
b _0221E556
@@ -14592,7 +14592,7 @@ _0221E3E8:
ldr r1, [r1]
ldr r2, _0221E528 ; =0x02241B10
ldr r2, [r2]
- bl FUN_020A7A90
+ bl WCM_SearchAsync
cmp r0, #3
bne _0221E402
b _0221E556
@@ -14615,7 +14615,7 @@ _0221E412:
_0221E41E:
cmp r2, #2
bne _0221E448
- bl FUN_020A7AC8
+ bl WCM_CleanupAsync
cmp r0, #3
bne _0221E42C
b _0221E556
@@ -14644,7 +14644,7 @@ _0221E448:
ldr r1, [r1]
ldr r2, _0221E534 ; =0x02241B08
ldr r2, [r2]
- bl FUN_020A75C0
+ bl WCM_ConnectAsync
cmp r0, #3
beq _0221E556
mov r1, #3
@@ -14690,7 +14690,7 @@ _0221E4A0:
ldr r0, [r0]
cmp r0, #2
bne _0221E556
- bl FUN_020A7E0C
+ bl WCM_Finish
mov r1, #0
ldr r0, _0221E518 ; =0x02241ADC
str r1, [r0]
diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s
index 79cee761..3215db95 100644
--- a/arm9/modules/55/asm/module_55.s
+++ b/arm9/modules/55/asm/module_55.s
@@ -2086,7 +2086,7 @@ _021D85B2:
ldr r0, [sp, #4]
add r6, r1, #0
bl FUN_02028228
- bl FUN_02096D68
+ bl DWC_CreateFriendKey
eor r1, r6
eor r0, r7
orr r0, r1
@@ -3492,7 +3492,7 @@ MOD55_021D90D8: ; 0x021D90D8
ldrb r1, [r1, #0x18]
sub r1, r1, #1
bl FUN_0202838C
- bl FUN_02096E24
+ bl DWC_GetFriendKey
str r1, [sp, #4]
add r4, r0, #0
ldr r0, [sp, #4]
@@ -3557,7 +3557,7 @@ MOD55_021D9184: ; 0x021D9184
add r7, r1, #0
bl FUN_020286EC
bl FUN_02028228
- bl FUN_02096D68
+ bl DWC_CreateFriendKey
add r6, r0, #0
add r4, r1, #0
ldr r0, [r5, #4]
@@ -5538,7 +5538,7 @@ MOD55_021DA224: ; 0x021DA224
bl FUN_02028228
add r1, r4, #0
add r2, r6, #0
- bl FUN_020973B4
+ bl DWC_CheckFriendKey
cmp r0, #0
bne _021DA24C
mov r0, #0
@@ -5562,7 +5562,7 @@ _021DA262:
bl FUN_0202838C
add r1, r4, #0
add r2, r6, #0
- bl FUN_02096D2C
+ bl DWC_CreateFriendKeyToken
_021DA276:
mov r0, #0
pop {r3, r4, r5, r6, r7, pc}
diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s
index 183fe0d3..08de4669 100644
--- a/arm9/modules/56/asm/module_56.s
+++ b/arm9/modules/56/asm/module_56.s
@@ -1539,7 +1539,7 @@ _02212A9A:
bl MOD56_022128A4
ldr r0, [r5]
bl FUN_02028228
- bl FUN_02096F80
+ bl DWC_CheckHasProfile
cmp r0, #0
bne _02212AFA
mov r0, #0
@@ -1577,7 +1577,7 @@ _02212A9A:
_02212AFA:
ldr r0, [r5]
bl FUN_02028228
- bl FUN_02096F18
+ bl DWC_CheckValidConsole
cmp r0, #0
bne _02212B1A
add r0, r5, #0
diff --git a/arm9/modules/79/asm/module_79_arm.s b/arm9/modules/79/asm/module_79_arm.s
index 9c6a0246..d737c74e 100644
--- a/arm9/modules/79/asm/module_79_arm.s
+++ b/arm9/modules/79/asm/module_79_arm.s
@@ -4723,7 +4723,7 @@ _022164D4:
cmp r1, r0
bne _02216524
mov r0, r5
- bl FUN_0209A6EC
+ bl SOC_GetHostByAddr
cmp r0, #0
moveq r0, #1
streq r0, [r4, #0xfc]
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index de0e7672..12992a4e 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -1346,7 +1346,7 @@ _0222DFB4:
mvn r0, r0
cmp r4, r0
beq _0222DFCC
- bl FUN_020A71F8
+ bl WCM_GetPhase
cmp r0, #9
beq _0222DFC8
mov r4, #0xd
@@ -18661,7 +18661,7 @@ _022369CC:
bl FUN_02023830
add r6, r0, #0
add r0, r4, #0
- bl FUN_02096D68
+ bl DWC_CreateFriendKey
add r3, r0, #0
add r2, r1, #0
add r0, r6, #0
diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s
index 73c58a93..d96f335e 100644
--- a/arm9/modules/82/asm/module_82.s
+++ b/arm9/modules/82/asm/module_82.s
@@ -596,7 +596,7 @@ _0222DA18:
mvn r0, r0
cmp r4, r0
beq _0222DA30
- bl FUN_020A71F8
+ bl WCM_GetPhase
cmp r0, #9
beq _0222DA2C
mov r4, #5
@@ -2282,7 +2282,7 @@ _0222E7C2:
add r4, r0, #0
ldr r0, [r5]
ldr r0, [r0, #0x14]
- bl FUN_02096D68
+ bl DWC_CreateFriendKey
add r3, r0, #0
add r2, r1, #0
add r0, r4, #0