diff options
Diffstat (limited to 'asm/SDK/DWC/dwc_match/dwc_friend.s')
-rw-r--r-- | asm/SDK/DWC/dwc_match/dwc_friend.s | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/asm/SDK/DWC/dwc_match/dwc_friend.s b/asm/SDK/DWC/dwc_match/dwc_friend.s index 413d6d2..398f34a 100644 --- a/asm/SDK/DWC/dwc_match/dwc_friend.s +++ b/asm/SDK/DWC/dwc_match/dwc_friend.s @@ -111,7 +111,7 @@ DWC_SetOwnStatusData: /* 8031F300 0031AF60 80 0D B0 48 */ lwz r0, lbl_80640308-_SDA_BASE_(r13)
/* 8031F304 0031AF64 2C 00 00 00 */ cmpwi r0, 0
/* 8031F308 0031AF68 41 82 00 10 */ beq lbl_8031F318
-/* 8031F30C 0031AF6C 48 00 28 C9 */ bl func_80321BD4
+/* 8031F30C 0031AF6C 48 00 28 C9 */ bl DWCi_CheckLogin
/* 8031F310 0031AF70 2C 03 00 00 */ cmpwi r3, 0
/* 8031F314 0031AF74 40 82 00 0C */ bne lbl_8031F320
lbl_8031F318:
@@ -171,13 +171,13 @@ DWC_DeleteBuddyFriendData: /* 8031F3C4 0031B024 80 0D B0 48 */ lwz r0, lbl_80640308-_SDA_BASE_(r13)
/* 8031F3C8 0031B028 2C 00 00 00 */ cmpwi r0, 0
/* 8031F3CC 0031B02C 41 82 00 7C */ beq lbl_8031F448
-/* 8031F3D0 0031B030 48 00 28 05 */ bl func_80321BD4
+/* 8031F3D0 0031B030 48 00 28 05 */ bl DWCi_CheckLogin
/* 8031F3D4 0031B034 2C 03 00 00 */ cmpwi r3, 0
/* 8031F3D8 0031B038 41 82 00 70 */ beq lbl_8031F448
-/* 8031F3DC 0031B03C 48 00 1D D9 */ bl func_803211B4
+/* 8031F3DC 0031B03C 48 00 1D D9 */ bl DWCi_GetUserData
/* 8031F3E0 0031B040 2C 03 00 00 */ cmpwi r3, 0
/* 8031F3E4 0031B044 41 82 00 64 */ beq lbl_8031F448
-/* 8031F3E8 0031B048 48 00 1D CD */ bl func_803211B4
+/* 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
/* 8031F3F4 0031B054 2C 03 00 00 */ cmpwi r3, 0
@@ -628,7 +628,7 @@ lbl_8031FA2C: /* 8031FA38 0031B698 38 60 00 00 */ li r3, 0
/* 8031FA3C 0031B69C 48 00 00 24 */ b lbl_8031FA60
lbl_8031FA40:
-/* 8031FA40 0031B6A0 48 00 17 75 */ bl func_803211B4
+/* 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
/* 8031FA4C 0031B6AC 2C 03 00 00 */ cmpwi r3, 0
@@ -689,7 +689,7 @@ DWCi_GetProfileIDFromList: /* 8031FB04 0031B764 38 60 00 00 */ li r3, 0
/* 8031FB08 0031B768 48 00 00 28 */ b lbl_8031FB30
lbl_8031FB0C:
-/* 8031FB0C 0031B76C 48 00 16 A9 */ bl func_803211B4
+/* 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
@@ -736,7 +736,7 @@ lbl_8031FB90: /* 8031FB9C 0031B7FC 38 60 00 00 */ li r3, 0
/* 8031FBA0 0031B800 48 00 00 24 */ b lbl_8031FBC4
lbl_8031FBA4:
-/* 8031FBA4 0031B804 48 00 16 11 */ bl func_803211B4
+/* 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
/* 8031FBB0 0031B810 2C 03 00 00 */ cmpwi r3, 0
@@ -806,7 +806,7 @@ DWCi_SetGPStatus: /* 8031FC80 0031B8E0 80 0D B0 48 */ lwz r0, lbl_80640308-_SDA_BASE_(r13)
/* 8031FC84 0031B8E4 2C 00 00 00 */ cmpwi r0, 0
/* 8031FC88 0031B8E8 41 82 00 10 */ beq lbl_8031FC98
-/* 8031FC8C 0031B8EC 48 00 1F 49 */ bl func_80321BD4
+/* 8031FC8C 0031B8EC 48 00 1F 49 */ bl DWCi_CheckLogin
/* 8031FC90 0031B8F0 2C 03 00 00 */ cmpwi r3, 0
/* 8031FC94 0031B8F4 40 82 00 0C */ bne lbl_8031FCA0
lbl_8031FC98:
@@ -922,7 +922,7 @@ lbl_8031FDFC: /* 8031FE0C 0031BA6C 38 60 00 00 */ li r3, 0
/* 8031FE10 0031BA70 48 00 00 24 */ b lbl_8031FE34
lbl_8031FE14:
-/* 8031FE14 0031BA74 48 00 13 A1 */ bl func_803211B4
+/* 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
/* 8031FE20 0031BA80 2C 03 00 00 */ cmpwi r3, 0
@@ -993,7 +993,7 @@ lbl_8031FEF8: /* 8031FF04 0031BB64 3B 80 00 00 */ li r28, 0
/* 8031FF08 0031BB68 48 00 00 30 */ b lbl_8031FF38
lbl_8031FF0C:
-/* 8031FF0C 0031BB6C 48 00 12 A9 */ bl func_803211B4
+/* 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
@@ -1038,7 +1038,7 @@ lbl_8031FF38: /* 8031FFA8 0031BC08 4B FF CB 8D */ bl DWC_Printf
/* 8031FFAC 0031BC0C 48 00 00 9C */ b lbl_80320048
lbl_8031FFB0:
-/* 8031FFB0 0031BC10 48 00 12 05 */ bl func_803211B4
+/* 8031FFB0 0031BC10 48 00 12 05 */ bl DWCi_GetUserData
/* 8031FFB4 0031BC14 80 8D B0 48 */ lwz r4, lbl_80640308-_SDA_BASE_(r13)
/* 8031FFB8 0031BC18 88 04 00 20 */ lbz r0, 0x20(r4)
/* 8031FFBC 0031BC1C 1C 00 00 0C */ mulli r0, r0, 0xc
@@ -1046,7 +1046,7 @@ lbl_8031FFB0: /* 8031FFC4 0031BC24 48 01 37 39 */ bl func_803336FC
/* 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 func_803211B4
+/* 8031FFD0 0031BC30 48 00 11 E5 */ bl DWCi_GetUserData
/* 8031FFD4 0031BC34 80 8D B0 48 */ lwz r4, lbl_80640308-_SDA_BASE_(r13)
/* 8031FFD8 0031BC38 38 A1 00 18 */ addi r5, r1, 0x18
/* 8031FFDC 0031BC3C 88 04 00 20 */ lbz r0, 0x20(r4)
@@ -1115,7 +1115,7 @@ lbl_803200AC: /* 803200BC 0031BD1C 38 60 00 00 */ li r3, 0
/* 803200C0 0031BD20 48 00 00 24 */ b lbl_803200E4
lbl_803200C4:
-/* 803200C4 0031BD24 48 00 10 F1 */ bl func_803211B4
+/* 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
/* 803200D0 0031BD30 2C 03 00 00 */ cmpwi r3, 0
@@ -1231,7 +1231,7 @@ lbl_8032024C: /* 8032025C 0031BEBC 3B E0 00 00 */ li r31, 0
/* 80320260 0031BEC0 48 00 00 2C */ b lbl_8032028C
lbl_80320264:
-/* 80320264 0031BEC4 48 00 0F 51 */ bl func_803211B4
+/* 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
/* 80320270 0031BED0 2C 03 00 00 */ cmpwi r3, 0
@@ -1263,7 +1263,7 @@ lbl_803202B4: /* 803202C4 0031BF24 38 60 00 00 */ li r3, 0
/* 803202C8 0031BF28 48 00 00 24 */ b lbl_803202EC
lbl_803202CC:
-/* 803202CC 0031BF2C 48 00 0E E9 */ bl func_803211B4
+/* 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
/* 803202D8 0031BF38 2C 03 00 00 */ cmpwi r3, 0
@@ -1360,14 +1360,14 @@ DWCi_GetFriendBuddyStatus: /* 80320414 0031C074 90 A1 00 08 */ stw r5, 8(r1)
/* 80320418 0031C078 2C 00 00 00 */ cmpwi r0, 0
/* 8032041C 0031C07C 41 82 00 10 */ beq lbl_8032042C
-/* 80320420 0031C080 48 00 17 B5 */ bl func_80321BD4
+/* 80320420 0031C080 48 00 17 B5 */ bl DWCi_CheckLogin
/* 80320424 0031C084 2C 03 00 00 */ cmpwi r3, 0
/* 80320428 0031C088 40 82 00 0C */ bne lbl_80320434
lbl_8032042C:
/* 8032042C 0031C08C 38 60 00 00 */ li r3, 0
/* 80320430 0031C090 48 00 00 74 */ b lbl_803204A4
lbl_80320434:
-/* 80320434 0031C094 48 00 0D 81 */ bl func_803211B4
+/* 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
/* 80320440 0031C0A0 2C 03 00 00 */ cmpwi r3, 0
@@ -1406,7 +1406,6 @@ lbl_803204A4: /* 803204B4 0031C114 38 21 00 20 */ addi r1, r1, 0x20
/* 803204B8 0031C118 4E 80 00 20 */ blr
-.global DWCi_HandleGPError
DWCi_HandleGPError:
/* 803204BC 0031C11C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 803204C0 0031C120 7C 08 02 A6 */ mflr r0
@@ -1819,7 +1818,7 @@ lbl_80320A7C: /* 80320A84 0031C6E4 48 01 20 ED */ bl func_80332B70
/* 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 func_803211B4
+/* 80320A90 0031C6F0 48 00 07 25 */ bl DWCi_GetUserData
/* 80320A94 0031C6F4 80 8D B0 48 */ lwz r4, lbl_80640308-_SDA_BASE_(r13)
/* 80320A98 0031C6F8 38 A1 00 08 */ addi r5, r1, 8
/* 80320A9C 0031C6FC 80 04 00 1C */ lwz r0, 0x1c(r4)
@@ -1861,7 +1860,7 @@ lbl_80320AFC: /* 80320B28 0031C788 40 82 00 4C */ bne lbl_80320B74
lbl_80320B2C:
/* 80320B2C 0031C78C 83 3B 00 04 */ lwz r25, 4(r27)
-/* 80320B30 0031C790 48 00 06 85 */ bl func_803211B4
+/* 80320B30 0031C790 48 00 06 85 */ bl DWCi_GetUserData
/* 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
@@ -1952,7 +1951,7 @@ lbl_80320C68: /* 80320C70 0031C8D0 48 01 1F 01 */ bl func_80332B70
/* 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 func_803211B4
+/* 80320C7C 0031C8DC 48 00 05 39 */ bl DWCi_GetUserData
/* 80320C80 0031C8E0 80 8D B0 48 */ lwz r4, lbl_80640308-_SDA_BASE_(r13)
/* 80320C84 0031C8E4 38 A1 00 08 */ addi r5, r1, 8
/* 80320C88 0031C8E8 80 04 00 1C */ lwz r0, 0x1c(r4)
@@ -2008,7 +2007,7 @@ lbl_80320D1C: /* 80320D48 0031C9A8 48 00 00 64 */ b lbl_80320DAC
lbl_80320D4C:
/* 80320D4C 0031C9AC 83 3A 00 04 */ lwz r25, 4(r26)
-/* 80320D50 0031C9B0 48 00 04 65 */ bl func_803211B4
+/* 80320D50 0031C9B0 48 00 04 65 */ bl DWCi_GetUserData
/* 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
|