split dwcsec_account, dwcsec_auth, dwcsec_nas

3 files changed, 73 insertions, 73 deletions

diff --git a/asm/SDK/DWC/dwc_match/dwc_friend.s b/asm/SDK/DWC/dwc_match/dwc_friend.s
index 398f34a..afa3e0a 100644
--- a/asm/SDK/DWC/dwc_match/dwc_friend.s
+++ b/asm/SDK/DWC/dwc_match/dwc_friend.s
@@ -179,7 +179,7 @@ DWC_DeleteBuddyFriendData:
 /* 8031F3E4 0031B044  41 82 00 64 */	beq lbl_8031F448

 /* 8031F3E8 0031B048  48 00 1D CD */	bl DWCi_GetUserData

 /* 8031F3EC 0031B04C  7F C4 F3 78 */	mr r4, r30

-/* 8031F3F0 0031B050  48 01 43 0D */	bl func_803336FC

+/* 8031F3F0 0031B050  48 01 43 0D */	bl DWC_GetGsProfileId

 /* 8031F3F4 0031B054  2C 03 00 00 */	cmpwi r3, 0

 /* 8031F3F8 0031B058  7C 7F 1B 78 */	mr r31, r3

 /* 8031F3FC 0031B05C  41 82 00 4C */	beq lbl_8031F448

@@ -630,7 +630,7 @@ lbl_8031FA2C:
 lbl_8031FA40:

 /* 8031FA40 0031B6A0  48 00 17 75 */	bl DWCi_GetUserData

 /* 8031FA44 0031B6A4  7C 9C EA 14 */	add r4, r28, r29

-/* 8031FA48 0031B6A8  48 01 3C B5 */	bl func_803336FC

+/* 8031FA48 0031B6A8  48 01 3C B5 */	bl DWC_GetGsProfileId

 /* 8031FA4C 0031B6AC  2C 03 00 00 */	cmpwi r3, 0

 /* 8031FA50 0031B6B0  41 82 00 0C */	beq lbl_8031FA5C

 /* 8031FA54 0031B6B4  2C 03 FF FF */	cmpwi r3, -1

@@ -692,7 +692,7 @@ lbl_8031FB0C:
 /* 8031FB0C 0031B76C  48 00 16 A9 */	bl DWCi_GetUserData

 /* 8031FB10 0031B770  1C 1E 00 0C */	mulli r0, r30, 0xc

 /* 8031FB14 0031B774  7C 9F 02 14 */	add r4, r31, r0

-/* 8031FB18 0031B778  48 01 3B E5 */	bl func_803336FC

+/* 8031FB18 0031B778  48 01 3B E5 */	bl DWC_GetGsProfileId

 /* 8031FB1C 0031B77C  2C 03 00 00 */	cmpwi r3, 0

 /* 8031FB20 0031B780  41 82 00 0C */	beq lbl_8031FB2C

 /* 8031FB24 0031B784  2C 03 FF FF */	cmpwi r3, -1

@@ -738,7 +738,7 @@ lbl_8031FB90:
 lbl_8031FBA4:

 /* 8031FBA4 0031B804  48 00 16 11 */	bl DWCi_GetUserData

 /* 8031FBA8 0031B808  7C 9E FA 14 */	add r4, r30, r31

-/* 8031FBAC 0031B80C  48 01 3B 51 */	bl func_803336FC

+/* 8031FBAC 0031B80C  48 01 3B 51 */	bl DWC_GetGsProfileId

 /* 8031FBB0 0031B810  2C 03 00 00 */	cmpwi r3, 0

 /* 8031FBB4 0031B814  41 82 00 0C */	beq lbl_8031FBC0

 /* 8031FBB8 0031B818  2C 03 FF FF */	cmpwi r3, -1

@@ -924,7 +924,7 @@ lbl_8031FDFC:
 lbl_8031FE14:

 /* 8031FE14 0031BA74  48 00 13 A1 */	bl DWCi_GetUserData

 /* 8031FE18 0031BA78  7C 9A DA 14 */	add r4, r26, r27

-/* 8031FE1C 0031BA7C  48 01 38 E1 */	bl func_803336FC

+/* 8031FE1C 0031BA7C  48 01 38 E1 */	bl DWC_GetGsProfileId

 /* 8031FE20 0031BA80  2C 03 00 00 */	cmpwi r3, 0

 /* 8031FE24 0031BA84  41 82 00 0C */	beq lbl_8031FE30

 /* 8031FE28 0031BA88  2C 03 FF FF */	cmpwi r3, -1

@@ -937,15 +937,15 @@ lbl_8031FE34:
 /* 8031FE3C 0031BA9C  40 82 00 3C */	bne lbl_8031FE78

 /* 8031FE40 0031BAA0  1F 59 00 0C */	mulli r26, r25, 0xc

 /* 8031FE44 0031BAA4  7C 7D D2 14 */	add r3, r29, r26

-/* 8031FE48 0031BAA8  48 01 2D 05 */	bl func_80332B4C

+/* 8031FE48 0031BAA8  48 01 2D 05 */	bl DWC_IsBuddyFriendData

 /* 8031FE4C 0031BAAC  2C 03 00 00 */	cmpwi r3, 0

 /* 8031FE50 0031BAB0  40 82 00 38 */	bne lbl_8031FE88

 /* 8031FE54 0031BAB4  7F 5D D2 14 */	add r26, r29, r26

 /* 8031FE58 0031BAB8  80 81 00 30 */	lwz r4, 0x30(r1)

 /* 8031FE5C 0031BABC  7F 43 D3 78 */	mr r3, r26

-/* 8031FE60 0031BAC0  48 01 3B FD */	bl func_80333A5C

+/* 8031FE60 0031BAC0  48 01 3B FD */	bl DWC_SetGsProfileId

 /* 8031FE64 0031BAC4  7F 43 D3 78 */	mr r3, r26

-/* 8031FE68 0031BAC8  48 01 2D 15 */	bl func_80332B7C

+/* 8031FE68 0031BAC8  48 01 2D 15 */	bl DWCi_SetBuddyFriendData

 /* 8031FE6C 0031BACC  80 6D B0 48 */	lwz r3, lbl_80640308-_SDA_BASE_(r13)

 /* 8031FE70 0031BAD0  9B 83 00 21 */	stb r28, 0x21(r3)

 /* 8031FE74 0031BAD4  48 00 00 14 */	b lbl_8031FE88

@@ -996,7 +996,7 @@ lbl_8031FF0C:
 /* 8031FF0C 0031BB6C  48 00 12 A9 */	bl DWCi_GetUserData

 /* 8031FF10 0031BB70  1C 1A 00 0C */	mulli r0, r26, 0xc

 /* 8031FF14 0031BB74  7C 9B 02 14 */	add r4, r27, r0

-/* 8031FF18 0031BB78  48 01 37 E5 */	bl func_803336FC

+/* 8031FF18 0031BB78  48 01 37 E5 */	bl DWC_GetGsProfileId

 /* 8031FF1C 0031BB7C  2C 03 00 00 */	cmpwi r3, 0

 /* 8031FF20 0031BB80  41 82 00 0C */	beq lbl_8031FF2C

 /* 8031FF24 0031BB84  2C 03 FF FF */	cmpwi r3, -1

@@ -1043,7 +1043,7 @@ lbl_8031FFB0:
 /* 8031FFB8 0031BC18  88 04 00 20 */	lbz r0, 0x20(r4)

 /* 8031FFBC 0031BC1C  1C 00 00 0C */	mulli r0, r0, 0xc

 /* 8031FFC0 0031BC20  7C 9D 02 14 */	add r4, r29, r0

-/* 8031FFC4 0031BC24  48 01 37 39 */	bl func_803336FC

+/* 8031FFC4 0031BC24  48 01 37 39 */	bl DWC_GetGsProfileId

 /* 8031FFC8 0031BC28  2C 03 FF FF */	cmpwi r3, -1

 /* 8031FFCC 0031BC2C  40 82 00 7C */	bne lbl_80320048

 /* 8031FFD0 0031BC30  48 00 11 E5 */	bl DWCi_GetUserData

@@ -1052,7 +1052,7 @@ lbl_8031FFB0:
 /* 8031FFDC 0031BC3C  88 04 00 20 */	lbz r0, 0x20(r4)

 /* 8031FFE0 0031BC40  1C 00 00 0C */	mulli r0, r0, 0xc

 /* 8031FFE4 0031BC44  7C 9D 02 14 */	add r4, r29, r0

-/* 8031FFE8 0031BC48  48 01 3A DD */	bl func_80333AC4

+/* 8031FFE8 0031BC48  48 01 3A DD */	bl DWC_LoginIdToUserName

 /* 8031FFEC 0031BC4C  3C 60 80 32 */	lis r3, DWCi_GPProfileSearchCallback@ha

 /* 8031FFF0 0031BC50  81 6D B0 48 */	lwz r11, lbl_80640308-_SDA_BASE_(r13)

 /* 8031FFF4 0031BC54  38 63 07 04 */	addi r3, r3, DWCi_GPProfileSearchCallback@l

@@ -1117,7 +1117,7 @@ lbl_803200AC:
 lbl_803200C4:

 /* 803200C4 0031BD24  48 00 10 F1 */	bl DWCi_GetUserData

 /* 803200C8 0031BD28  7C 9E FA 14 */	add r4, r30, r31

-/* 803200CC 0031BD2C  48 01 36 31 */	bl func_803336FC

+/* 803200CC 0031BD2C  48 01 36 31 */	bl DWC_GetGsProfileId

 /* 803200D0 0031BD30  2C 03 00 00 */	cmpwi r3, 0

 /* 803200D4 0031BD34  41 82 00 0C */	beq lbl_803200E0

 /* 803200D8 0031BD38  2C 03 FF FF */	cmpwi r3, -1

@@ -1132,7 +1132,7 @@ lbl_803200E4:
 /* 803200F4 0031BD54  1F DC 00 0C */	mulli r30, r28, 0xc

 /* 803200F8 0031BD58  7F FA F2 14 */	add r31, r26, r30

 /* 803200FC 0031BD5C  7F E3 FB 78 */	mr r3, r31

-/* 80320100 0031BD60  48 01 2A 71 */	bl func_80332B70

+/* 80320100 0031BD60  48 01 2A 71 */	bl DWC_GetFriendDataType

 /* 80320104 0031BD64  3C 80 80 44 */	lis r4, lbl_80446EA0@ha

 /* 80320108 0031BD68  7C 67 1B 78 */	mr r7, r3

 /* 8032010C 0031BD6C  7F 85 E3 78 */	mr r5, r28

@@ -1143,11 +1143,11 @@ lbl_803200E4:
 /* 80320120 0031BD80  4B FF CA 15 */	bl DWC_Printf

 /* 80320124 0031BD84  1F BB 00 0C */	mulli r29, r27, 0xc

 /* 80320128 0031BD88  7C 7A EA 14 */	add r3, r26, r29

-/* 8032012C 0031BD8C  48 01 2A 21 */	bl func_80332B4C

+/* 8032012C 0031BD8C  48 01 2A 21 */	bl DWC_IsBuddyFriendData

 /* 80320130 0031BD90  2C 03 00 00 */	cmpwi r3, 0

 /* 80320134 0031BD94  41 82 00 58 */	beq lbl_8032018C

 /* 80320138 0031BD98  7F E3 FB 78 */	mr r3, r31

-/* 8032013C 0031BD9C  48 01 2A 11 */	bl func_80332B4C

+/* 8032013C 0031BD9C  48 01 2A 11 */	bl DWC_IsBuddyFriendData

 /* 80320140 0031BDA0  2C 03 00 00 */	cmpwi r3, 0

 /* 80320144 0031BDA4  40 82 00 48 */	bne lbl_8032018C

 /* 80320148 0031BDA8  80 0D B0 48 */	lwz r0, lbl_80640308-_SDA_BASE_(r13)

@@ -1233,7 +1233,7 @@ lbl_8032024C:
 lbl_80320264:

 /* 80320264 0031BEC4  48 00 0F 51 */	bl DWCi_GetUserData

 /* 80320268 0031BEC8  7C 96 F2 14 */	add r4, r22, r30

-/* 8032026C 0031BECC  48 01 34 91 */	bl func_803336FC

+/* 8032026C 0031BECC  48 01 34 91 */	bl DWC_GetGsProfileId

 /* 80320270 0031BED0  2C 03 00 00 */	cmpwi r3, 0

 /* 80320274 0031BED4  41 82 00 0C */	beq lbl_80320280

 /* 80320278 0031BED8  2C 03 FF FF */	cmpwi r3, -1

@@ -1265,7 +1265,7 @@ lbl_803202B4:
 lbl_803202CC:

 /* 803202CC 0031BF2C  48 00 0E E9 */	bl DWCi_GetUserData

 /* 803202D0 0031BF30  7C 90 CA 14 */	add r4, r16, r25

-/* 803202D4 0031BF34  48 01 34 29 */	bl func_803336FC

+/* 803202D4 0031BF34  48 01 34 29 */	bl DWC_GetGsProfileId

 /* 803202D8 0031BF38  2C 03 00 00 */	cmpwi r3, 0

 /* 803202DC 0031BF3C  41 82 00 0C */	beq lbl_803202E8

 /* 803202E0 0031BF40  2C 03 FF FF */	cmpwi r3, -1

@@ -1276,26 +1276,26 @@ lbl_803202EC:
 /* 803202EC 0031BF4C  7C 1F 18 00 */	cmpw r31, r3

 /* 803202F0 0031BF50  40 82 00 B4 */	bne lbl_803203A4

 /* 803202F4 0031BF54  7F A3 EB 78 */	mr r3, r29

-/* 803202F8 0031BF58  48 01 28 79 */	bl func_80332B70

+/* 803202F8 0031BF58  48 01 28 79 */	bl DWC_GetFriendDataType

 /* 803202FC 0031BF5C  2C 03 00 02 */	cmpwi r3, 2

 /* 80320300 0031BF60  40 82 00 20 */	bne lbl_80320320

 /* 80320304 0031BF64  7F 63 DB 78 */	mr r3, r27

-/* 80320308 0031BF68  48 01 28 69 */	bl func_80332B70

+/* 80320308 0031BF68  48 01 28 69 */	bl DWC_GetFriendDataType

 /* 8032030C 0031BF6C  2C 03 00 03 */	cmpwi r3, 3

 /* 80320310 0031BF70  40 82 00 10 */	bne lbl_80320320

 /* 80320314 0031BF74  7F 83 E3 78 */	mr r3, r28

 /* 80320318 0031BF78  7F E4 FB 78 */	mr r4, r31

-/* 8032031C 0031BF7C  48 01 37 41 */	bl func_80333A5C

+/* 8032031C 0031BF7C  48 01 37 41 */	bl DWC_SetGsProfileId

 lbl_80320320:

 /* 80320320 0031BF80  7F 63 DB 78 */	mr r3, r27

-/* 80320324 0031BF84  48 01 28 29 */	bl func_80332B4C

+/* 80320324 0031BF84  48 01 28 29 */	bl DWC_IsBuddyFriendData

 /* 80320328 0031BF88  2C 03 00 00 */	cmpwi r3, 0

 /* 8032032C 0031BF8C  41 82 00 0C */	beq lbl_80320338

 /* 80320330 0031BF90  7F 83 E3 78 */	mr r3, r28

-/* 80320334 0031BF94  48 01 28 49 */	bl func_80332B7C

+/* 80320334 0031BF94  48 01 28 49 */	bl DWCi_SetBuddyFriendData

 lbl_80320338:

 /* 80320338 0031BF98  7F A3 EB 78 */	mr r3, r29

-/* 8032033C 0031BF9C  48 01 28 35 */	bl func_80332B70

+/* 8032033C 0031BF9C  48 01 28 35 */	bl DWC_GetFriendDataType

 /* 80320340 0031BFA0  7C 67 1B 78 */	mr r7, r3

 /* 80320344 0031BFA4  7E E5 BB 78 */	mr r5, r23

 /* 80320348 0031BFA8  7E C6 B3 78 */	mr r6, r22

@@ -1369,7 +1369,7 @@ lbl_8032042C:
 lbl_80320434:

 /* 80320434 0031C094  48 00 0D 81 */	bl DWCi_GetUserData

 /* 80320438 0031C098  7F E4 FB 78 */	mr r4, r31

-/* 8032043C 0031C09C  48 01 32 C1 */	bl func_803336FC

+/* 8032043C 0031C09C  48 01 32 C1 */	bl DWC_GetGsProfileId

 /* 80320440 0031C0A0  2C 03 00 00 */	cmpwi r3, 0

 /* 80320444 0031C0A4  7C 7F 1B 78 */	mr r31, r3

 /* 80320448 0031C0A8  40 81 00 28 */	ble lbl_80320470

@@ -1598,7 +1598,7 @@ DWCi_GPProfileSearchCallback:
 /* 80320760 0031C3C0  1F DD 00 0C */	mulli r30, r29, 0xc

 /* 80320764 0031C3C4  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320768 0031C3C8  7C 60 F2 14 */	add r3, r0, r30

-/* 8032076C 0031C3CC  48 01 24 05 */	bl func_80332B70

+/* 8032076C 0031C3CC  48 01 24 05 */	bl DWC_GetFriendDataType

 /* 80320770 0031C3D0  2C 03 00 00 */	cmpwi r3, 0

 /* 80320774 0031C3D4  41 82 02 24 */	beq lbl_80320998

 /* 80320778 0031C3D8  80 BC 00 04 */	lwz r5, 4(r28)

@@ -1675,11 +1675,11 @@ lbl_80320874:
 /* 8032087C 0031C4DC  80 04 00 1C */	lwz r0, 0x1c(r4)

 /* 80320880 0031C4E0  80 83 00 00 */	lwz r4, 0(r3)

 /* 80320884 0031C4E4  7C 60 F2 14 */	add r3, r0, r30

-/* 80320888 0031C4E8  48 01 31 D5 */	bl func_80333A5C

+/* 80320888 0031C4E8  48 01 31 D5 */	bl DWC_SetGsProfileId

 /* 8032088C 0031C4EC  80 6D B0 48 */	lwz r3, lbl_80640308-_SDA_BASE_(r13)

 /* 80320890 0031C4F0  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320894 0031C4F4  7C 60 F2 14 */	add r3, r0, r30

-/* 80320898 0031C4F8  48 01 22 E5 */	bl func_80332B7C

+/* 80320898 0031C4F8  48 01 22 E5 */	bl DWCi_SetBuddyFriendData

 /* 8032089C 0031C4FC  80 8D B0 48 */	lwz r4, lbl_80640308-_SDA_BASE_(r13)

 /* 803208A0 0031C500  81 84 00 48 */	lwz r12, 0x48(r4)

 /* 803208A4 0031C504  2C 0C 00 00 */	cmpwi r12, 0

@@ -1764,7 +1764,7 @@ lbl_803209B4:
 /* 803209C4 0031C624  1C 1D 00 0C */	mulli r0, r29, 0xc

 /* 803209C8 0031C628  80 63 00 1C */	lwz r3, 0x1c(r3)

 /* 803209CC 0031C62C  7C 63 02 14 */	add r3, r3, r0

-/* 803209D0 0031C630  48 01 21 A1 */	bl func_80332B70

+/* 803209D0 0031C630  48 01 21 A1 */	bl DWC_GetFriendDataType

 /* 803209D4 0031C634  2C 03 00 00 */	cmpwi r3, 0

 /* 803209D8 0031C638  40 82 00 20 */	bne lbl_803209F8

 lbl_803209DC:

@@ -1815,7 +1815,7 @@ lbl_80320A58:
 lbl_80320A7C:

 /* 80320A7C 0031C6DC  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320A80 0031C6E0  7C 60 F2 14 */	add r3, r0, r30

-/* 80320A84 0031C6E4  48 01 20 ED */	bl func_80332B70

+/* 80320A84 0031C6E4  48 01 20 ED */	bl DWC_GetFriendDataType

 /* 80320A88 0031C6E8  2C 03 00 01 */	cmpwi r3, 1

 /* 80320A8C 0031C6EC  40 82 00 70 */	bne lbl_80320AFC

 /* 80320A90 0031C6F0  48 00 07 25 */	bl DWCi_GetUserData

@@ -1823,7 +1823,7 @@ lbl_80320A7C:
 /* 80320A98 0031C6F8  38 A1 00 08 */	addi r5, r1, 8

 /* 80320A9C 0031C6FC  80 04 00 1C */	lwz r0, 0x1c(r4)

 /* 80320AA0 0031C700  7C 80 F2 14 */	add r4, r0, r30

-/* 80320AA4 0031C704  48 01 30 21 */	bl func_80333AC4

+/* 80320AA4 0031C704  48 01 30 21 */	bl DWC_LoginIdToUserName

 /* 80320AA8 0031C708  38 61 00 08 */	addi r3, r1, 8

 /* 80320AAC 0031C70C  38 9B 00 8E */	addi r4, r27, 0x8e

 /* 80320AB0 0031C710  4B EA D9 9D */	bl strcmp

@@ -1836,7 +1836,7 @@ lbl_80320A7C:
 /* 80320ACC 0031C72C  80 9B 00 04 */	lwz r4, 4(r27)

 /* 80320AD0 0031C730  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320AD4 0031C734  7C 60 F2 14 */	add r3, r0, r30

-/* 80320AD8 0031C738  48 01 2F 85 */	bl func_80333A5C

+/* 80320AD8 0031C738  48 01 2F 85 */	bl DWC_SetGsProfileId

 /* 80320ADC 0031C73C  80 BB 00 04 */	lwz r5, 4(r27)

 /* 80320AE0 0031C740  7F A6 EB 78 */	mr r6, r29

 /* 80320AE4 0031C744  38 9F 03 50 */	addi r4, r31, 0x350

@@ -1849,13 +1849,13 @@ lbl_80320AFC:
 /* 80320AFC 0031C75C  80 6D B0 48 */	lwz r3, lbl_80640308-_SDA_BASE_(r13)

 /* 80320B00 0031C760  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320B04 0031C764  7C 60 F2 14 */	add r3, r0, r30

-/* 80320B08 0031C768  48 01 20 69 */	bl func_80332B70

+/* 80320B08 0031C768  48 01 20 69 */	bl DWC_GetFriendDataType

 /* 80320B0C 0031C76C  2C 03 00 03 */	cmpwi r3, 3

 /* 80320B10 0031C770  41 82 00 1C */	beq lbl_80320B2C

 /* 80320B14 0031C774  80 6D B0 48 */	lwz r3, lbl_80640308-_SDA_BASE_(r13)

 /* 80320B18 0031C778  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320B1C 0031C77C  7C 60 F2 14 */	add r3, r0, r30

-/* 80320B20 0031C780  48 01 20 51 */	bl func_80332B70

+/* 80320B20 0031C780  48 01 20 51 */	bl DWC_GetFriendDataType

 /* 80320B24 0031C784  2C 03 00 02 */	cmpwi r3, 2

 /* 80320B28 0031C788  40 82 00 4C */	bne lbl_80320B74

 lbl_80320B2C:

@@ -1864,7 +1864,7 @@ lbl_80320B2C:
 /* 80320B34 0031C794  80 8D B0 48 */	lwz r4, lbl_80640308-_SDA_BASE_(r13)

 /* 80320B38 0031C798  80 04 00 1C */	lwz r0, 0x1c(r4)

 /* 80320B3C 0031C79C  7C 80 F2 14 */	add r4, r0, r30

-/* 80320B40 0031C7A0  48 01 2B BD */	bl func_803336FC

+/* 80320B40 0031C7A0  48 01 2B BD */	bl DWC_GetGsProfileId

 /* 80320B44 0031C7A4  7C 19 18 00 */	cmpw r25, r3

 /* 80320B48 0031C7A8  40 82 00 2C */	bne lbl_80320B74

 /* 80320B4C 0031C7AC  7F 43 D3 78 */	mr r3, r26

@@ -1948,7 +1948,7 @@ lbl_80320C44:
 lbl_80320C68:

 /* 80320C68 0031C8C8  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320C6C 0031C8CC  7C 60 F2 14 */	add r3, r0, r30

-/* 80320C70 0031C8D0  48 01 1F 01 */	bl func_80332B70

+/* 80320C70 0031C8D0  48 01 1F 01 */	bl DWC_GetFriendDataType

 /* 80320C74 0031C8D4  2C 03 00 01 */	cmpwi r3, 1

 /* 80320C78 0031C8D8  40 82 00 74 */	bne lbl_80320CEC

 /* 80320C7C 0031C8DC  48 00 05 39 */	bl DWCi_GetUserData

@@ -1956,7 +1956,7 @@ lbl_80320C68:
 /* 80320C84 0031C8E4  38 A1 00 08 */	addi r5, r1, 8

 /* 80320C88 0031C8E8  80 04 00 1C */	lwz r0, 0x1c(r4)

 /* 80320C8C 0031C8EC  7C 80 F2 14 */	add r4, r0, r30

-/* 80320C90 0031C8F0  48 01 2E 35 */	bl func_80333AC4

+/* 80320C90 0031C8F0  48 01 2E 35 */	bl DWC_LoginIdToUserName

 /* 80320C94 0031C8F4  38 61 00 08 */	addi r3, r1, 8

 /* 80320C98 0031C8F8  38 9A 00 8E */	addi r4, r26, 0x8e

 /* 80320C9C 0031C8FC  4B EA D7 B1 */	bl strcmp

@@ -1966,11 +1966,11 @@ lbl_80320C68:
 /* 80320CAC 0031C90C  80 9A 00 04 */	lwz r4, 4(r26)

 /* 80320CB0 0031C910  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320CB4 0031C914  7C 60 F2 14 */	add r3, r0, r30

-/* 80320CB8 0031C918  48 01 2D A5 */	bl func_80333A5C

+/* 80320CB8 0031C918  48 01 2D A5 */	bl DWC_SetGsProfileId

 /* 80320CBC 0031C91C  80 6D B0 48 */	lwz r3, lbl_80640308-_SDA_BASE_(r13)

 /* 80320CC0 0031C920  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320CC4 0031C924  7C 60 F2 14 */	add r3, r0, r30

-/* 80320CC8 0031C928  48 01 1E B5 */	bl func_80332B7C

+/* 80320CC8 0031C928  48 01 1E B5 */	bl DWCi_SetBuddyFriendData

 /* 80320CCC 0031C92C  80 BA 00 04 */	lwz r5, 4(r26)

 /* 80320CD0 0031C930  7F A6 EB 78 */	mr r6, r29

 /* 80320CD4 0031C934  38 9F 04 18 */	addi r4, r31, 0x418

@@ -1983,20 +1983,20 @@ lbl_80320CEC:
 /* 80320CEC 0031C94C  80 6D B0 48 */	lwz r3, lbl_80640308-_SDA_BASE_(r13)

 /* 80320CF0 0031C950  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320CF4 0031C954  7C 60 F2 14 */	add r3, r0, r30

-/* 80320CF8 0031C958  48 01 1E 79 */	bl func_80332B70

+/* 80320CF8 0031C958  48 01 1E 79 */	bl DWC_GetFriendDataType

 /* 80320CFC 0031C95C  2C 03 00 03 */	cmpwi r3, 3

 /* 80320D00 0031C960  41 82 00 1C */	beq lbl_80320D1C

 /* 80320D04 0031C964  80 6D B0 48 */	lwz r3, lbl_80640308-_SDA_BASE_(r13)

 /* 80320D08 0031C968  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320D0C 0031C96C  7C 60 F2 14 */	add r3, r0, r30

-/* 80320D10 0031C970  48 01 1E 61 */	bl func_80332B70

+/* 80320D10 0031C970  48 01 1E 61 */	bl DWC_GetFriendDataType

 /* 80320D14 0031C974  2C 03 00 02 */	cmpwi r3, 2

 /* 80320D18 0031C978  40 82 00 94 */	bne lbl_80320DAC

 lbl_80320D1C:

 /* 80320D1C 0031C97C  80 6D B0 48 */	lwz r3, lbl_80640308-_SDA_BASE_(r13)

 /* 80320D20 0031C980  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320D24 0031C984  7C 60 F2 14 */	add r3, r0, r30

-/* 80320D28 0031C988  48 01 1E 25 */	bl func_80332B4C

+/* 80320D28 0031C988  48 01 1E 25 */	bl DWC_IsBuddyFriendData

 /* 80320D2C 0031C98C  2C 03 00 01 */	cmpwi r3, 1

 /* 80320D30 0031C990  40 82 00 1C */	bne lbl_80320D4C

 /* 80320D34 0031C994  38 9F 04 44 */	addi r4, r31, 0x444

@@ -2011,18 +2011,18 @@ lbl_80320D4C:
 /* 80320D54 0031C9B4  80 8D B0 48 */	lwz r4, lbl_80640308-_SDA_BASE_(r13)

 /* 80320D58 0031C9B8  80 04 00 1C */	lwz r0, 0x1c(r4)

 /* 80320D5C 0031C9BC  7C 80 F2 14 */	add r4, r0, r30

-/* 80320D60 0031C9C0  48 01 29 9D */	bl func_803336FC

+/* 80320D60 0031C9C0  48 01 29 9D */	bl DWC_GetGsProfileId

 /* 80320D64 0031C9C4  7C 19 18 00 */	cmpw r25, r3

 /* 80320D68 0031C9C8  40 82 00 44 */	bne lbl_80320DAC

 /* 80320D6C 0031C9CC  80 6D B0 48 */	lwz r3, lbl_80640308-_SDA_BASE_(r13)

 /* 80320D70 0031C9D0  7F 24 CB 78 */	mr r4, r25

 /* 80320D74 0031C9D4  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320D78 0031C9D8  7C 60 F2 14 */	add r3, r0, r30

-/* 80320D7C 0031C9DC  48 01 2C E1 */	bl func_80333A5C

+/* 80320D7C 0031C9DC  48 01 2C E1 */	bl DWC_SetGsProfileId

 /* 80320D80 0031C9E0  80 6D B0 48 */	lwz r3, lbl_80640308-_SDA_BASE_(r13)

 /* 80320D84 0031C9E4  80 03 00 1C */	lwz r0, 0x1c(r3)

 /* 80320D88 0031C9E8  7C 60 F2 14 */	add r3, r0, r30

-/* 80320D8C 0031C9EC  48 01 1D F1 */	bl func_80332B7C

+/* 80320D8C 0031C9EC  48 01 1D F1 */	bl DWCi_SetBuddyFriendData

 /* 80320D90 0031C9F0  80 BA 00 04 */	lwz r5, 4(r26)

 /* 80320D94 0031C9F4  7F A6 EB 78 */	mr r6, r29

 /* 80320D98 0031C9F8  38 9F 04 68 */	addi r4, r31, 0x468

diff --git a/asm/SDK/DWC/dwc_match/dwc_login.s b/asm/SDK/DWC/dwc_match/dwc_login.s
index 6060c69..81cb9af 100644
--- a/asm/SDK/DWC/dwc_match/dwc_login.s
+++ b/asm/SDK/DWC/dwc_match/dwc_login.s
@@ -50,7 +50,7 @@ DWCi_LoginInit:
 /* 80320F44 0031CBA4  4C C6 31 82 */	crclr 6

 /* 80320F48 0031CBA8  4B FF BB ED */	bl DWC_Printf

 /* 80320F4C 0031CBAC  38 78 00 04 */	addi r3, r24, 4

-/* 80320F50 0031CBB0  48 01 1B BD */	bl func_80332B0C

+/* 80320F50 0031CBB0  48 01 1B BD */	bl DWCi_Acc_GetUserId

 /* 80320F54 0031CBB4  7C 86 23 78 */	mr r6, r4

 /* 80320F58 0031CBB8  7C 65 1B 78 */	mr r5, r3

 /* 80320F5C 0031CBBC  38 9F 00 38 */	addi r4, r31, 0x38

@@ -58,14 +58,14 @@ DWCi_LoginInit:
 /* 80320F64 0031CBC4  4C C6 31 82 */	crclr 6

 /* 80320F68 0031CBC8  4B FF BB CD */	bl DWC_Printf

 /* 80320F6C 0031CBCC  38 78 00 04 */	addi r3, r24, 4

-/* 80320F70 0031CBD0  48 01 1B AD */	bl func_80332B1C

+/* 80320F70 0031CBD0  48 01 1B AD */	bl DWCi_Acc_GetPlayerId

 /* 80320F74 0031CBD4  7C 65 1B 78 */	mr r5, r3

 /* 80320F78 0031CBD8  38 9F 00 58 */	addi r4, r31, 0x58

 /* 80320F7C 0031CBDC  38 60 00 20 */	li r3, 0x20

 /* 80320F80 0031CBE0  4C C6 31 82 */	crclr 6

 /* 80320F84 0031CBE4  4B FF BB B1 */	bl DWC_Printf

 /* 80320F88 0031CBE8  38 78 00 10 */	addi r3, r24, 0x10

-/* 80320F8C 0031CBEC  48 01 1B 81 */	bl func_80332B0C

+/* 80320F8C 0031CBEC  48 01 1B 81 */	bl DWCi_Acc_GetUserId

 /* 80320F90 0031CBF0  7C 86 23 78 */	mr r6, r4

 /* 80320F94 0031CBF4  7C 65 1B 78 */	mr r5, r3

 /* 80320F98 0031CBF8  38 9F 00 78 */	addi r4, r31, 0x78

@@ -73,7 +73,7 @@ DWCi_LoginInit:
 /* 80320FA0 0031CC00  4C C6 31 82 */	crclr 6

 /* 80320FA4 0031CC04  4B FF BB 91 */	bl DWC_Printf

 /* 80320FA8 0031CC08  38 78 00 10 */	addi r3, r24, 0x10

-/* 80320FAC 0031CC0C  48 01 1B 71 */	bl func_80332B1C

+/* 80320FAC 0031CC0C  48 01 1B 71 */	bl DWCi_Acc_GetPlayerId

 /* 80320FB0 0031CC10  7C 65 1B 78 */	mr r5, r3

 /* 80320FB4 0031CC14  38 9F 00 98 */	addi r4, r31, 0x98

 /* 80320FB8 0031CC18  38 60 00 20 */	li r3, 0x20

@@ -276,10 +276,10 @@ DWCi_ShutdownLogin:
 /* 80321254 0031CEB4  94 21 FF F0 */	stwu r1, -0x10(r1)

 /* 80321258 0031CEB8  7C 08 02 A6 */	mflr r0

 /* 8032125C 0031CEBC  90 01 00 14 */	stw r0, 0x14(r1)

-/* 80321260 0031CEC0  48 01 37 69 */	bl func_803349C8

+/* 80321260 0031CEC0  48 01 37 69 */	bl DWCi_Auth_IsFinished

 /* 80321264 0031CEC4  2C 03 00 00 */	cmpwi r3, 0

 /* 80321268 0031CEC8  40 82 00 08 */	bne lbl_80321270

-/* 8032126C 0031CECC  48 01 2F CD */	bl func_80334238

+/* 8032126C 0031CECC  48 01 2F CD */	bl DWCi_Auth_AbortAuthentication

 lbl_80321270:

 /* 80321270 0031CED0  38 00 00 00 */	li r0, 0

 /* 80321274 0031CED4  90 0D B0 50 */	stw r0, lbl_80640310-_SDA_BASE_(r13)

@@ -500,7 +500,7 @@ DWCi_RemoteLogin:
 /* 80321578 0031D1D8  4B FF B5 BD */	bl DWC_Printf

 /* 8032157C 0031D1DC  80 6D B0 50 */	lwz r3, lbl_80640310-_SDA_BASE_(r13)

 /* 80321580 0031D1E0  80 63 00 1C */	lwz r3, 0x1c(r3)

-/* 80321584 0031D1E4  48 01 1C 35 */	bl func_803331B8

+/* 80321584 0031D1E4  48 01 1C 35 */	bl DWCi_Acc_IsAuthentic

 /* 80321588 0031D1E8  2C 03 00 00 */	cmpwi r3, 0

 /* 8032158C 0031D1EC  41 82 00 44 */	beq lbl_803215D0

 /* 80321590 0031D1F0  38 9F 01 6C */	addi r4, r31, 0x16c

@@ -512,11 +512,11 @@ DWCi_RemoteLogin:
 /* 803215A8 0031D208  38 A4 02 4C */	addi r5, r4, 0x24c

 /* 803215AC 0031D20C  80 83 00 24 */	lwz r4, 0x24(r3)

 /* 803215B0 0031D210  38 63 00 10 */	addi r3, r3, 0x10

-/* 803215B4 0031D214  48 01 16 F5 */	bl func_80332CA8

+/* 803215B4 0031D214  48 01 16 F5 */	bl DWCi_Acc_LoginIdToUserName

 /* 803215B8 0031D218  80 6D B0 50 */	lwz r3, lbl_80640310-_SDA_BASE_(r13)

 /* 803215BC 0031D21C  80 63 00 1C */	lwz r3, 0x1c(r3)

 /* 803215C0 0031D220  38 63 00 10 */	addi r3, r3, 0x10

-/* 803215C4 0031D224  48 01 15 49 */	bl func_80332B0C

+/* 803215C4 0031D224  48 01 15 49 */	bl DWCi_Acc_GetUserId

 /* 803215C8 0031D228  7C 65 1B 78 */	mr r5, r3

 /* 803215CC 0031D22C  48 00 01 1C */	b lbl_803216E8

 lbl_803215D0:

@@ -526,7 +526,7 @@ lbl_803215D0:
 /* 803215DC 0031D23C  4B FF B5 59 */	bl DWC_Printf

 /* 803215E0 0031D240  80 6D B0 50 */	lwz r3, lbl_80640310-_SDA_BASE_(r13)

 /* 803215E4 0031D244  38 63 00 40 */	addi r3, r3, 0x40

-/* 803215E8 0031D248  48 01 1B B9 */	bl func_803331A0

+/* 803215E8 0031D248  48 01 1B B9 */	bl DWCi_Acc_IsValidLoginId

 /* 803215EC 0031D24C  2C 03 00 00 */	cmpwi r3, 0

 /* 803215F0 0031D250  40 82 00 80 */	bne lbl_80321670

 /* 803215F4 0031D254  38 9F 01 D0 */	addi r4, r31, 0x1d0

@@ -536,7 +536,7 @@ lbl_803215D0:
 /* 80321604 0031D264  80 6D B0 50 */	lwz r3, lbl_80640310-_SDA_BASE_(r13)

 /* 80321608 0031D268  80 63 00 1C */	lwz r3, 0x1c(r3)

 /* 8032160C 0031D26C  38 63 00 04 */	addi r3, r3, 4

-/* 80321610 0031D270  48 01 1B 41 */	bl func_80333150

+/* 80321610 0031D270  48 01 1B 41 */	bl DWCi_Acc_CheckConsoleUserId

 /* 80321614 0031D274  2C 03 00 00 */	cmpwi r3, 0

 /* 80321618 0031D278  41 82 00 38 */	beq lbl_80321650

 /* 8032161C 0031D27C  38 9F 02 0C */	addi r4, r31, 0x20c

@@ -559,7 +559,7 @@ lbl_80321650:
 /* 8032165C 0031D2BC  4B FF B4 D9 */	bl DWC_Printf

 /* 80321660 0031D2C0  80 6D B0 50 */	lwz r3, lbl_80640310-_SDA_BASE_(r13)

 /* 80321664 0031D2C4  38 63 00 40 */	addi r3, r3, 0x40

-/* 80321668 0031D2C8  48 01 1A 21 */	bl func_80333088

+/* 80321668 0031D2C8  48 01 1A 21 */	bl DWCi_Acc_CreateTempLoginId

 /* 8032166C 0031D2CC  48 00 00 60 */	b lbl_803216CC

 lbl_80321670:

 /* 80321670 0031D2D0  38 9F 02 64 */	addi r4, r31, 0x264

@@ -584,13 +584,13 @@ lbl_80321670:
 /* 803216BC 0031D31C  7C 08 00 14 */	addc r0, r8, r0

 /* 803216C0 0031D320  7C 05 22 14 */	add r0, r5, r4

 /* 803216C4 0031D324  7C 80 31 14 */	adde r4, r0, r6

-/* 803216C8 0031D328  48 01 14 7D */	bl func_80332B44

+/* 803216C8 0031D328  48 01 14 7D */	bl DWCi_Acc_SetPlayerId

 lbl_803216CC:

 /* 803216CC 0031D32C  80 AD B0 50 */	lwz r5, lbl_80640310-_SDA_BASE_(r13)

 /* 803216D0 0031D330  80 85 00 0C */	lwz r4, 0xc(r5)

 /* 803216D4 0031D334  38 65 00 40 */	addi r3, r5, 0x40

 /* 803216D8 0031D338  38 A5 02 4C */	addi r5, r5, 0x24c

-/* 803216DC 0031D33C  48 01 15 CD */	bl func_80332CA8

+/* 803216DC 0031D33C  48 01 15 CD */	bl DWCi_Acc_LoginIdToUserName

 /* 803216E0 0031D340  38 80 00 00 */	li r4, 0

 /* 803216E4 0031D344  38 A0 00 00 */	li r5, 0

 lbl_803216E8:

@@ -602,7 +602,7 @@ lbl_803216E8:
 /* 803216FC 0031D35C  38 89 02 55 */	addi r4, r9, 0x255

 /* 80321700 0031D360  38 E7 C8 EC */	addi r7, r7, DWC_Alloc@l

 /* 80321704 0031D364  39 08 C9 88 */	addi r8, r8, DWC_Free@l

-/* 80321708 0031D368  48 01 29 85 */	bl func_8033408C

+/* 80321708 0031D368  48 01 29 85 */	bl DWCi_Auth_StartAuthentication

 /* 8032170C 0031D36C  80 01 00 14 */	lwz r0, 0x14(r1)

 /* 80321710 0031D370  83 E1 00 0C */	lwz r31, 0xc(r1)

 /* 80321714 0031D374  7C 08 03 A6 */	mtlr r0

@@ -618,11 +618,11 @@ DWCi_RemoteLoginProcess:
 /* 80321730 0031D390  3F E0 80 44 */	lis r31, lbl_80447248@ha

 /* 80321734 0031D394  3B FF 72 48 */	addi r31, r31, lbl_80447248@l

 /* 80321738 0031D398  93 C1 00 08 */	stw r30, 8(r1)

-/* 8032173C 0031D39C  48 01 2C 05 */	bl func_80334340

-/* 80321740 0031D3A0  48 01 32 89 */	bl func_803349C8

+/* 8032173C 0031D39C  48 01 2C 05 */	bl DWCi_Auth_ProcessAuthentication

+/* 80321740 0031D3A0  48 01 32 89 */	bl DWCi_Auth_IsFinished

 /* 80321744 0031D3A4  2C 03 00 00 */	cmpwi r3, 0

 /* 80321748 0031D3A8  41 82 02 0C */	beq lbl_80321954

-/* 8032174C 0031D3AC  48 01 32 B9 */	bl func_80334A04

+/* 8032174C 0031D3AC  48 01 32 B9 */	bl DWCi_Auth_IsSucceeded

 /* 80321750 0031D3B0  2C 03 00 00 */	cmpwi r3, 0

 /* 80321754 0031D3B4  41 82 01 28 */	beq lbl_8032187C

 /* 80321758 0031D3B8  38 9F 02 A8 */	addi r4, r31, 0x2a8

@@ -632,10 +632,10 @@ DWCi_RemoteLoginProcess:
 /* 80321768 0031D3C8  80 8D B0 50 */	lwz r4, lbl_80640310-_SDA_BASE_(r13)

 /* 8032176C 0031D3CC  38 64 00 4C */	addi r3, r4, 0x4c

 /* 80321770 0031D3D0  38 84 01 4C */	addi r4, r4, 0x14c

-/* 80321774 0031D3D4  48 01 32 B5 */	bl func_80334A28

+/* 80321774 0031D3D4  48 01 32 B5 */	bl DWCi_Auth_GetGameSpyToken

 /* 80321778 0031D3D8  80 6D B0 50 */	lwz r3, lbl_80640310-_SDA_BASE_(r13)

 /* 8032177C 0031D3DC  80 63 00 1C */	lwz r3, 0x1c(r3)

-/* 80321780 0031D3E0  48 01 1A 39 */	bl func_803331B8

+/* 80321780 0031D3E0  48 01 1A 39 */	bl DWCi_Acc_IsAuthentic

 /* 80321784 0031D3E4  2C 03 00 00 */	cmpwi r3, 0

 /* 80321788 0031D3E8  41 82 00 70 */	beq lbl_803217F8

 /* 8032178C 0031D3EC  38 9F 02 B8 */	addi r4, r31, 0x2b8

@@ -666,12 +666,12 @@ DWCi_RemoteLoginProcess:
 /* 803217F0 0031D450  90 03 00 04 */	stw r0, 4(r3)

 /* 803217F4 0031D454  48 00 01 60 */	b lbl_80321954

 lbl_803217F8:

-/* 803217F8 0031D458  48 01 32 7D */	bl func_80334A74

+/* 803217F8 0031D458  48 01 32 7D */	bl DWCi_Auth_GetConsoleUserId

 /* 803217FC 0031D45C  80 ED B0 50 */	lwz r7, lbl_80640310-_SDA_BASE_(r13)

 /* 80321800 0031D460  7C 65 1B 78 */	mr r5, r3

 /* 80321804 0031D464  7C 86 23 78 */	mr r6, r4

 /* 80321808 0031D468  38 67 00 40 */	addi r3, r7, 0x40

-/* 8032180C 0031D46C  48 01 13 19 */	bl func_80332B24

+/* 8032180C 0031D46C  48 01 13 19 */	bl DWCi_Acc_SetUserId

 /* 80321810 0031D470  38 9F 02 B8 */	addi r4, r31, 0x2b8

 /* 80321814 0031D474  38 60 00 20 */	li r3, 0x20

 /* 80321818 0031D478  4C C6 31 82 */	crclr 6

@@ -700,7 +700,7 @@ lbl_803217F8:
 /* 80321874 0031D4D4  90 03 00 04 */	stw r0, 4(r3)

 /* 80321878 0031D4D8  48 00 00 DC */	b lbl_80321954

 lbl_8032187C:

-/* 8032187C 0031D4DC  48 01 31 A1 */	bl func_80334A1C

+/* 8032187C 0031D4DC  48 01 31 A1 */	bl DWCi_Auth_GetErrorCode

 /* 80321880 0031D4E0  7C 7E 1B 78 */	mr r30, r3

 /* 80321884 0031D4E4  38 9F 02 E0 */	addi r4, r31, 0x2e0

 /* 80321888 0031D4E8  7F C5 F3 78 */	mr r5, r30

@@ -795,7 +795,7 @@ DWCi_GPGetInfoCallback:
 /* 803219D4 0031D634  80 64 00 1C */	lwz r3, 0x1c(r4)

 /* 803219D8 0031D638  80 84 00 0C */	lwz r4, 0xc(r4)

 /* 803219DC 0031D63C  38 63 00 04 */	addi r3, r3, 4

-/* 803219E0 0031D640  48 01 12 C9 */	bl func_80332CA8

+/* 803219E0 0031D640  48 01 12 C9 */	bl DWCi_Acc_LoginIdToUserName

 /* 803219E4 0031D644  7F A3 EB 78 */	mr r3, r29

 /* 803219E8 0031D648  38 A1 00 38 */	addi r5, r1, 0x38

 /* 803219EC 0031D64C  38 80 07 05 */	li r4, 0x705

@@ -841,7 +841,7 @@ lbl_80321A78:
 /* 80321A84 0031D6E4  38 A1 00 20 */	addi r5, r1, 0x20

 /* 80321A88 0031D6E8  80 86 00 0C */	lwz r4, 0xc(r6)

 /* 80321A8C 0031D6EC  38 63 00 04 */	addi r3, r3, 4

-/* 80321A90 0031D6F0  48 01 12 19 */	bl func_80332CA8

+/* 80321A90 0031D6F0  48 01 12 19 */	bl DWCi_Acc_LoginIdToUserName

 /* 80321A94 0031D6F4  38 7E 00 8E */	addi r3, r30, 0x8e

 /* 80321A98 0031D6F8  38 81 00 20 */	addi r4, r1, 0x20

 /* 80321A9C 0031D6FC  4B EA C9 B1 */	bl strcmp

@@ -851,7 +851,7 @@ lbl_80321A78:
 /* 80321AAC 0031D70C  38 A1 00 08 */	addi r5, r1, 8

 /* 80321AB0 0031D710  80 83 00 0C */	lwz r4, 0xc(r3)

 /* 80321AB4 0031D714  38 63 00 40 */	addi r3, r3, 0x40

-/* 80321AB8 0031D718  48 01 11 F1 */	bl func_80332CA8

+/* 80321AB8 0031D718  48 01 11 F1 */	bl DWCi_Acc_LoginIdToUserName

 /* 80321ABC 0031D71C  80 FE 00 04 */	lwz r7, 4(r30)

 /* 80321AC0 0031D720  38 9F 03 78 */	addi r4, r31, 0x378

 /* 80321AC4 0031D724  38 A1 00 08 */	addi r5, r1, 8

@@ -863,7 +863,7 @@ lbl_80321A78:
 /* 80321ADC 0031D73C  80 BE 00 04 */	lwz r5, 4(r30)

 /* 80321AE0 0031D740  80 64 00 1C */	lwz r3, 0x1c(r4)

 /* 80321AE4 0031D744  38 84 00 40 */	addi r4, r4, 0x40

-/* 80321AE8 0031D748  48 01 19 01 */	bl func_803333E8

+/* 80321AE8 0031D748  48 01 19 01 */	bl DWCi_Acc_SetLoginIdToUserData

 /* 80321AEC 0031D74C  7F A3 EB 78 */	mr r3, r29

 /* 80321AF0 0031D750  48 01 B5 21 */	bl gpDisconnect

 /* 80321AF4 0031D754  38 9F 02 B8 */	addi r4, r31, 0x2b8

diff --git a/asm/SDK/DWC/dwc_match/dwc_match.s b/asm/SDK/DWC/dwc_match/dwc_match.s
index fed403d..d61e76a 100644
--- a/asm/SDK/DWC/dwc_match/dwc_match.s
+++ b/asm/SDK/DWC/dwc_match/dwc_match.s
@@ -7671,7 +7671,7 @@ lbl_8032B0D4:
 /* 8032B0EC 00326D4C  88 04 03 14 */	lbz r0, 0x314(r4)
 /* 8032B0F0 00326D50  1C 00 00 0C */	mulli r0, r0, 0xc
 /* 8032B0F4 00326D54  7C 85 02 14 */	add r4, r5, r0
-/* 8032B0F8 00326D58  48 00 86 05 */	bl func_803336FC
+/* 8032B0F8 00326D58  48 00 86 05 */	bl DWC_GetGsProfileId
 /* 8032B0FC 00326D5C  2C 03 00 00 */	cmpwi r3, 0
 /* 8032B100 00326D60  7C 7C 1B 78 */	mr r28, r3
 /* 8032B104 00326D64  41 82 FF 58 */	beq lbl_8032B05C
@@ -7684,7 +7684,7 @@ lbl_8032B0D4:
 /* 8032B120 00326D80  88 03 03 14 */	lbz r0, 0x314(r3)
 /* 8032B124 00326D84  1C 00 00 0C */	mulli r0, r0, 0xc
 /* 8032B128 00326D88  7C 64 02 14 */	add r3, r4, r0
-/* 8032B12C 00326D8C  48 00 80 BD */	bl func_803331E8
+/* 8032B12C 00326D8C  48 00 80 BD */	bl DWCi_Acc_IsValidFriendData
 /* 8032B130 00326D90  2C 03 00 00 */	cmpwi r3, 0
 /* 8032B134 00326D94  41 82 FF 28 */	beq lbl_8032B05C
 /* 8032B138 00326D98  80 8D B0 68 */	lwz r4, lbl_80640328-_SDA_BASE_(r13)