added labels to snd_DvdSoundArchive.s (forgot to do it before)

3 files changed, 37 insertions, 37 deletions

diff --git a/asm/NW4R/snd_DvdSoundArchive.s b/asm/NW4R/snd_DvdSoundArchive.s
index d3d425f..cf0f273 100644
--- a/asm/NW4R/snd_DvdSoundArchive.s
+++ b/asm/NW4R/snd_DvdSoundArchive.s
@@ -2,8 +2,8 @@
 

 .section .text, "ax"  # 0x80006980 - 0x803E1E60

 

-.global func_8036F688

-func_8036F688:

+.global __ct__Q34nw4r3snd15DvdSoundArchiveFv

+__ct__Q34nw4r3snd15DvdSoundArchiveFv:

 /* 8036F688 0036B2E8  94 21 FF F0 */	stwu r1, -0x10(r1)

 /* 8036F68C 0036B2EC  7C 08 02 A6 */	mflr r0

 /* 8036F690 0036B2F0  90 01 00 14 */	stw r0, 0x14(r1)

@@ -24,8 +24,8 @@ func_8036F688:
 /* 8036F6CC 0036B32C  38 21 00 10 */	addi r1, r1, 0x10

 /* 8036F6D0 0036B330  4E 80 00 20 */	blr

 

-.global func_8036F6D4

-func_8036F6D4:

+.global __dt__Q34nw4r3snd15DvdSoundArchiveFv

+__dt__Q34nw4r3snd15DvdSoundArchiveFv:

 /* 8036F6D4 0036B334  94 21 FF F0 */	stwu r1, -0x10(r1)

 /* 8036F6D8 0036B338  7C 08 02 A6 */	mflr r0

 /* 8036F6DC 0036B33C  2C 03 00 00 */	cmpwi r3, 0

@@ -60,8 +60,8 @@ lbl_8036F738:
 /* 8036F74C 0036B3AC  38 21 00 10 */	addi r1, r1, 0x10

 /* 8036F750 0036B3B0  4E 80 00 20 */	blr

 

-.global func_8036F754

-func_8036F754:

+.global Open__Q34nw4r3snd15DvdSoundArchiveFPCc

+Open__Q34nw4r3snd15DvdSoundArchiveFPCc:

 /* 8036F754 0036B3B4  94 21 FE 80 */	stwu r1, -0x180(r1)

 /* 8036F758 0036B3B8  7C 08 02 A6 */	mflr r0

 /* 8036F75C 0036B3BC  90 01 01 84 */	stw r0, 0x184(r1)

@@ -162,8 +162,8 @@ lbl_8036F894:
 /* 8036F8AC 0036B50C  38 21 01 80 */	addi r1, r1, 0x180

 /* 8036F8B0 0036B510  4E 80 00 20 */	blr

 

-.global func_8036F8B4

-func_8036F8B4:

+.global Close__Q34nw4r3snd15DvdSoundArchiveFv

+Close__Q34nw4r3snd15DvdSoundArchiveFv:

 /* 8036F8B4 0036B514  94 21 FF F0 */	stwu r1, -0x10(r1)

 /* 8036F8B8 0036B518  7C 08 02 A6 */	mflr r0

 /* 8036F8BC 0036B51C  90 01 00 14 */	stw r0, 0x14(r1)

@@ -181,8 +181,8 @@ func_8036F8B4:
 /* 8036F8EC 0036B54C  38 21 00 10 */	addi r1, r1, 0x10

 /* 8036F8F0 0036B550  4E 80 00 20 */	blr

 

-.global func_8036F8F4

-func_8036F8F4:

+.global OpenStream__Q34nw4r3snd15DvdSoundArchiveCFPviUlUl

+OpenStream__Q34nw4r3snd15DvdSoundArchiveCFPviUlUl:

 /* 8036F8F4 0036B554  94 21 FF E0 */	stwu r1, -0x20(r1)

 /* 8036F8F8 0036B558  7C 08 02 A6 */	mflr r0

 /* 8036F8FC 0036B55C  7C 68 1B 78 */	mr r8, r3

@@ -235,8 +235,8 @@ lbl_8036F990:
 /* 8036F9A4 0036B604  38 21 00 20 */	addi r1, r1, 0x20

 /* 8036F9A8 0036B608  4E 80 00 20 */	blr

 

-.global func_8036F9AC

-func_8036F9AC:

+.global OpenExtStream__Q34nw4r3snd15DvdSoundArchiveCFPviPCcUlUl

+OpenExtStream__Q34nw4r3snd15DvdSoundArchiveCFPviPCcUlUl:

 /* 8036F9AC 0036B60C  94 21 FF E0 */	stwu r1, -0x20(r1)

 /* 8036F9B0 0036B610  7C 08 02 A6 */	mflr r0

 /* 8036F9B4 0036B614  90 01 00 24 */	stw r0, 0x24(r1)

@@ -294,13 +294,13 @@ lbl_8036FA58:
 /* 8036FA6C 0036B6CC  38 21 00 20 */	addi r1, r1, 0x20

 /* 8036FA70 0036B6D0  4E 80 00 20 */	blr

 

-.global func_8036FA74

-func_8036FA74:

+.global detail_GetRequiredStreamBufferSize__Q34nw4r3snd15DvdSoundArchiveCFv

+detail_GetRequiredStreamBufferSize__Q34nw4r3snd15DvdSoundArchiveCFv:

 /* 8036FA74 0036B6D4  38 60 00 78 */	li r3, 0x78

 /* 8036FA78 0036B6D8  4E 80 00 20 */	blr

 

-.global func_8036FA7C

-func_8036FA7C:

+.global LoadHeader__Q34nw4r3snd15DvdSoundArchiveFPvUl

+LoadHeader__Q34nw4r3snd15DvdSoundArchiveFPvUl:

 /* 8036FA7C 0036B6DC  94 21 FF E0 */	stwu r1, -0x20(r1)

 /* 8036FA80 0036B6E0  7C 08 02 A6 */	mflr r0

 /* 8036FA84 0036B6E4  90 01 00 24 */	stw r0, 0x24(r1)

@@ -339,8 +339,8 @@ lbl_8036FAE8:
 /* 8036FAFC 0036B75C  38 21 00 20 */	addi r1, r1, 0x20

 /* 8036FB00 0036B760  4E 80 00 20 */	blr

 

-.global func_8036FB04

-func_8036FB04:

+.global Read__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamFPvUl

+Read__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamFPvUl:

 /* 8036FB04 0036B764  81 03 00 18 */	lwz r8, 0x18(r3)

 /* 8036FB08 0036B768  80 E3 00 70 */	lwz r7, 0x70(r3)

 /* 8036FB0C 0036B76C  80 C3 00 74 */	lwz r6, 0x74(r3)

@@ -354,8 +354,8 @@ func_8036FB04:
 lbl_8036FB2C:

 /* 8036FB2C 0036B78C  4B FF 42 44 */	b Read__Q34nw4r2ut19DvdLockedFileStreamFPvUl

 

-.global func_8036FB30

-func_8036FB30:

+.global Seek__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamFlUl

+Seek__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamFlUl:

 /* 8036FB30 0036B790  2C 05 00 01 */	cmpwi r5, 1

 /* 8036FB34 0036B794  41 82 00 2C */	beq lbl_8036FB60

 /* 8036FB38 0036B798  40 80 00 10 */	bge lbl_8036FB48

@@ -398,30 +398,30 @@ lbl_8036FBAC:
 /* 8036FBB0 0036B810  4B FF 3F A8 */	b Seek__Q34nw4r2ut13DvdFileStreamFlUl

 /* 8036FBB4 0036B814  4E 80 00 20 */	blr

 

-.global func_8036FBB8

-func_8036FBB8:

+.global GetSize__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamCFv

+GetSize__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamCFv:

 /* 8036FBB8 0036B818  80 63 00 74 */	lwz r3, 0x74(r3)

 /* 8036FBBC 0036B81C  4E 80 00 20 */	blr

 

-.global func_8036FBC0

-func_8036FBC0:

+.global Tell__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamCFv

+Tell__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamCFv:

 /* 8036FBC0 0036B820  80 83 00 70 */	lwz r4, 0x70(r3)

 /* 8036FBC4 0036B824  80 03 00 18 */	lwz r0, 0x18(r3)

 /* 8036FBC8 0036B828  7C 64 00 50 */	subf r3, r4, r0

 /* 8036FBCC 0036B82C  4E 80 00 20 */	blr

 

-.global func_8036FBD0

-func_8036FBD0:

+.global detail_GetWaveDataFileAddress__Q34nw4r3snd15DvdSoundArchiveCFUl

+detail_GetWaveDataFileAddress__Q34nw4r3snd15DvdSoundArchiveCFUl:

 /* 8036FBD0 0036B830  38 60 00 00 */	li r3, 0

 /* 8036FBD4 0036B834  4E 80 00 20 */	blr

 

-.global func_8036FBD8

-func_8036FBD8:

+.global detail_GetFileAddress__Q34nw4r3snd15DvdSoundArchiveCFUl

+detail_GetFileAddress__Q34nw4r3snd15DvdSoundArchiveCFUl:

 /* 8036FBD8 0036B838  38 60 00 00 */	li r3, 0

 /* 8036FBDC 0036B83C  4E 80 00 20 */	blr

 

-.global func_8036FBE0

-func_8036FBE0:

+.global __dt__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamFv

+__dt__Q44nw4r3snd15DvdSoundArchive13DvdFileStreamFv:

 /* 8036FBE0 0036B840  94 21 FF F0 */	stwu r1, -0x10(r1)

 /* 8036FBE4 0036B844  7C 08 02 A6 */	mflr r0

 /* 8036FBE8 0036B848  2C 03 00 00 */	cmpwi r3, 0

diff --git a/asm/text_11.s b/asm/text_11.s
index 129dda3..15f5b62 100644
--- a/asm/text_11.s
+++ b/asm/text_11.s
@@ -30096,13 +30096,13 @@ func_8039A408:
 /* 8039A46C 003960CC  2C 03 00 00 */	cmpwi r3, 0
 /* 8039A470 003960D0  41 82 00 10 */	beq lbl_8039A480
 /* 8039A474 003960D4  41 82 00 08 */	beq lbl_8039A47C
-/* 8039A478 003960D8  4B FD 52 11 */	bl func_8036F688
+/* 8039A478 003960D8  4B FD 52 11 */	bl __ct__Q34nw4r3snd15DvdSoundArchiveFv
 lbl_8039A47C:
 /* 8039A47C 003960DC  90 7D 05 D4 */	stw r3, 0x5d4(r29)
 lbl_8039A480:
 /* 8039A480 003960E0  80 7D 05 D4 */	lwz r3, 0x5d4(r29)
 /* 8039A484 003960E4  7F 84 E3 78 */	mr r4, r28
-/* 8039A488 003960E8  4B FD 52 CD */	bl func_8036F754
+/* 8039A488 003960E8  4B FD 52 CD */	bl Open__Q34nw4r3snd15DvdSoundArchiveFPCc
 /* 8039A48C 003960EC  80 9D 05 D4 */	lwz r4, 0x5d4(r29)
 /* 8039A490 003960F0  3C 60 80 64 */	lis r3, lbl_8063CEC8@ha
 /* 8039A494 003960F4  38 63 CE C8 */	addi r3, r3, lbl_8063CEC8@l
@@ -30112,7 +30112,7 @@ lbl_8039A480:
 /* 8039A4A4 00396104  7C 64 1B 78 */	mr r4, r3
 /* 8039A4A8 00396108  80 7D 05 D4 */	lwz r3, 0x5d4(r29)
 /* 8039A4AC 0039610C  7F C5 F3 78 */	mr r5, r30
-/* 8039A4B0 00396110  4B FD 55 CD */	bl func_8036FA7C
+/* 8039A4B0 00396110  4B FD 55 CD */	bl LoadHeader__Q34nw4r3snd15DvdSoundArchiveFPvUl
 /* 8039A4B4 00396114  80 9D 05 D4 */	lwz r4, 0x5d4(r29)
 /* 8039A4B8 00396118  7F A3 EB 78 */	mr r3, r29
 /* 8039A4BC 0039611C  38 A0 00 01 */	li r5, 1
@@ -40274,7 +40274,7 @@ func_803A357C:
 /* 803A35A4 0039F204  80 7E 05 D4 */	lwz r3, 0x5d4(r30)
 /* 803A35A8 0039F208  2C 03 00 00 */	cmpwi r3, 0
 /* 803A35AC 0039F20C  41 82 00 20 */	beq lbl_803A35CC
-/* 803A35B0 0039F210  4B FC C3 05 */	bl func_8036F8B4
+/* 803A35B0 0039F210  4B FC C3 05 */	bl Close__Q34nw4r3snd15DvdSoundArchiveFv
 /* 803A35B4 0039F214  80 7E 05 D4 */	lwz r3, 0x5d4(r30)
 /* 803A35B8 0039F218  38 80 FF FF */	li r4, -1
 /* 803A35BC 0039F21C  81 83 00 00 */	lwz r12, 0(r3)
diff --git a/asm/text_7.s b/asm/text_7.s
index 9ce8986..67951d5 100644
--- a/asm/text_7.s
+++ b/asm/text_7.s
@@ -57198,14 +57198,14 @@ func_8025463C:
 /* 80254678 002502D8  4B F8 63 B9 */	bl func_801DAA30
 /* 8025467C 002502DC  2C 03 00 00 */	cmpwi r3, 0
 /* 80254680 002502E0  41 82 00 08 */	beq lbl_80254688
-/* 80254684 002502E4  48 11 B0 05 */	bl func_8036F688
+/* 80254684 002502E4  48 11 B0 05 */	bl __ct__Q34nw4r3snd15DvdSoundArchiveFv
 lbl_80254688:
 /* 80254688 002502E8  90 7E 00 00 */	stw r3, 0(r30)
 /* 8025468C 002502EC  7F 44 D3 78 */	mr r4, r26
 /* 80254690 002502F0  93 1E 00 1C */	stw r24, 0x1c(r30)
 /* 80254694 002502F4  92 FE 00 2C */	stw r23, 0x2c(r30)
 /* 80254698 002502F8  93 3E 00 D0 */	stw r25, 0xd0(r30)
-/* 8025469C 002502FC  48 11 B0 B9 */	bl func_8036F754
+/* 8025469C 002502FC  48 11 B0 B9 */	bl Open__Q34nw4r3snd15DvdSoundArchiveFPCc
 /* 802546A0 00250300  2C 03 00 00 */	cmpwi r3, 0
 /* 802546A4 00250304  40 82 00 34 */	bne lbl_802546D8
 /* 802546A8 00250308  80 7E 00 00 */	lwz r3, 0(r30)
@@ -57231,7 +57231,7 @@ lbl_802546D8:
 /* 802546F0 00250350  7C 64 1B 78 */	mr r4, r3
 /* 802546F4 00250354  80 7E 00 00 */	lwz r3, 0(r30)
 /* 802546F8 00250358  7F 85 E3 78 */	mr r5, r28
-/* 802546FC 0025035C  48 11 B3 81 */	bl func_8036FA7C
+/* 802546FC 0025035C  48 11 B3 81 */	bl LoadHeader__Q34nw4r3snd15DvdSoundArchiveFPvUl
 /* 80254700 00250360  2C 03 00 00 */	cmpwi r3, 0
 /* 80254704 00250364  40 82 00 34 */	bne lbl_80254738
 /* 80254708 00250368  80 7E 00 00 */	lwz r3, 0(r30)