Split libwcm and name routines

4 files changed, 71 insertions, 71 deletions

diff --git a/arm9/modules/04/asm/arm_04.s b/arm9/modules/04/asm/arm_04.s
index 129acd10..1f9a41fa 100644
--- a/arm9/modules/04/asm/arm_04.s
+++ b/arm9/modules/04/asm/arm_04.s
@@ -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
@@ -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}
@@ -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
@@ -21928,7 +21928,7 @@ MOD04_021EBC60: ; 0x021EBC60
 	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
@@ -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
@@ -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
diff --git a/arm9/modules/13/asm/module_13_thumb.s b/arm9/modules/13/asm/module_13_thumb.s
index 4eadd8c7..51681246 100644
--- a/arm9/modules/13/asm/module_13_thumb.s
+++ b/arm9/modules/13/asm/module_13_thumb.s
@@ -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]
@@ -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/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index de0e7672..bf202f2f 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
diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s
index 73c58a93..18e1984d 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