split snd_SoundHeap.s

6 files changed, 138 insertions, 129 deletions

diff --git a/asm/nw4r/snd/snd_SoundArchivePlayer.s b/asm/nw4r/snd/snd_SoundArchivePlayer.s
index c3156ae..e125823 100644
--- a/asm/nw4r/snd/snd_SoundArchivePlayer.s
+++ b/asm/nw4r/snd/snd_SoundArchivePlayer.s
@@ -795,7 +795,7 @@ lbl_80379470:
 /* 80379478 003750D8  82 A1 00 0C */	lwz r21, 0xc(r1)

 /* 8037947C 003750DC  41 82 00 20 */	beq lbl_8037949C

 /* 80379480 003750E0  7E 83 A3 78 */	mr r3, r20

-/* 80379484 003750E4  48 00 15 B9 */	bl func_8037AA3C

+/* 80379484 003750E4  48 00 15 B9 */	bl __ct__Q34nw4r3snd9SoundHeapFv

 /* 80379488 003750E8  92 D4 00 00 */	stw r22, 0(r20)

 /* 8037948C 003750EC  92 F4 00 2C */	stw r23, 0x2c(r20)

 /* 80379490 003750F0  92 F4 00 30 */	stw r23, 0x30(r20)

@@ -805,7 +805,7 @@ lbl_8037949C:
 /* 8037949C 003750FC  7E 83 A3 78 */	mr r3, r20

 /* 803794A0 00375100  7E A5 AB 78 */	mr r5, r21

 /* 803794A4 00375104  38 94 00 3C */	addi r4, r20, 0x3c

-/* 803794A8 00375108  48 00 16 4D */	bl func_8037AAF4

+/* 803794A8 00375108  48 00 16 4D */	bl Create__Q34nw4r3snd9SoundHeapFPvUl

 /* 803794AC 0037510C  2C 03 00 00 */	cmpwi r3, 0

 /* 803794B0 00375110  41 82 00 08 */	beq lbl_803794B8

 /* 803794B4 00375114  48 00 00 08 */	b lbl_803794BC

@@ -2291,7 +2291,7 @@ __dt__Q44nw4r3snd6detail10PlayerHeapFv:
 /* 8037A8D0 00376530  7C 7E 1B 78 */	mr r30, r3

 /* 8037A8D4 00376534  41 82 00 1C */	beq lbl_8037A8F0

 /* 8037A8D8 00376538  38 80 00 00 */	li r4, 0

-/* 8037A8DC 0037653C  48 00 01 A9 */	bl func_8037AA84

+/* 8037A8DC 0037653C  48 00 01 A9 */	bl __dt__Q34nw4r3snd9SoundHeapFv

 /* 8037A8E0 00376540  2C 1F 00 00 */	cmpwi r31, 0

 /* 8037A8E4 00376544  40 81 00 0C */	ble lbl_8037A8F0

 /* 8037A8E8 00376548  7F C3 F3 78 */	mr r3, r30

diff --git a/asm/nw4r/snd/snd_SoundHeap.s b/asm/nw4r/snd/snd_SoundHeap.s
new file mode 100644
index 0000000..ff95769
--- /dev/null
+++ b/asm/nw4r/snd/snd_SoundHeap.s
@@ -0,0 +1,126 @@
+.include "macros.inc"

+

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

+

+.global __ct__Q34nw4r3snd9SoundHeapFv

+__ct__Q34nw4r3snd9SoundHeapFv:

+/* 8037AA3C 0037669C  94 21 FF F0 */	stwu r1, -0x10(r1)

+/* 8037AA40 003766A0  7C 08 02 A6 */	mflr r0

+/* 8037AA44 003766A4  3C 80 80 45 */	lis r4, lbl_8044CEC8@ha

+/* 8037AA48 003766A8  90 01 00 14 */	stw r0, 0x14(r1)

+/* 8037AA4C 003766AC  38 84 CE C8 */	addi r4, r4, lbl_8044CEC8@l

+/* 8037AA50 003766B0  93 E1 00 0C */	stw r31, 0xc(r1)

+/* 8037AA54 003766B4  7C 7F 1B 78 */	mr r31, r3

+/* 8037AA58 003766B8  90 83 00 00 */	stw r4, 0(r3)

+/* 8037AA5C 003766BC  38 63 00 1C */	addi r3, r3, 0x1c

+/* 8037AA60 003766C0  4B FF 55 FD */	bl __ct__Q44nw4r3snd6detail9FrameHeapFv

+/* 8037AA64 003766C4  38 7F 00 04 */	addi r3, r31, 4

+/* 8037AA68 003766C8  4B EF 4E A9 */	bl func_8026F910

+/* 8037AA6C 003766CC  7F E3 FB 78 */	mr r3, r31

+/* 8037AA70 003766D0  83 E1 00 0C */	lwz r31, 0xc(r1)

+/* 8037AA74 003766D4  80 01 00 14 */	lwz r0, 0x14(r1)

+/* 8037AA78 003766D8  7C 08 03 A6 */	mtlr r0

+/* 8037AA7C 003766DC  38 21 00 10 */	addi r1, r1, 0x10

+/* 8037AA80 003766E0  4E 80 00 20 */	blr

+

+.global __dt__Q34nw4r3snd9SoundHeapFv

+__dt__Q34nw4r3snd9SoundHeapFv:

+/* 8037AA84 003766E4  94 21 FF F0 */	stwu r1, -0x10(r1)

+/* 8037AA88 003766E8  7C 08 02 A6 */	mflr r0

+/* 8037AA8C 003766EC  2C 03 00 00 */	cmpwi r3, 0

+/* 8037AA90 003766F0  90 01 00 14 */	stw r0, 0x14(r1)

+/* 8037AA94 003766F4  93 E1 00 0C */	stw r31, 0xc(r1)

+/* 8037AA98 003766F8  7C 9F 23 78 */	mr r31, r4

+/* 8037AA9C 003766FC  93 C1 00 08 */	stw r30, 8(r1)

+/* 8037AAA0 00376700  7C 7E 1B 78 */	mr r30, r3

+/* 8037AAA4 00376704  41 82 00 34 */	beq lbl_8037AAD8

+/* 8037AAA8 00376708  3C 80 80 45 */	lis r4, lbl_8044CEC8@ha

+/* 8037AAAC 0037670C  38 84 CE C8 */	addi r4, r4, lbl_8044CEC8@l

+/* 8037AAB0 00376710  90 83 00 00 */	stw r4, 0(r3)

+/* 8037AAB4 00376714  38 63 00 1C */	addi r3, r3, 0x1c

+/* 8037AAB8 00376718  4B FF 58 79 */	bl Destroy__Q44nw4r3snd6detail9FrameHeapFv

+/* 8037AABC 0037671C  38 7E 00 1C */	addi r3, r30, 0x1c

+/* 8037AAC0 00376720  38 80 FF FF */	li r4, -1

+/* 8037AAC4 00376724  4B FF 55 BD */	bl __dt__Q44nw4r3snd6detail9FrameHeapFv

+/* 8037AAC8 00376728  2C 1F 00 00 */	cmpwi r31, 0

+/* 8037AACC 0037672C  40 81 00 0C */	ble lbl_8037AAD8

+/* 8037AAD0 00376730  7F C3 F3 78 */	mr r3, r30

+/* 8037AAD4 00376734  4B E5 FF E5 */	bl func_801DAAB8

+lbl_8037AAD8:

+/* 8037AAD8 00376738  7F C3 F3 78 */	mr r3, r30

+/* 8037AADC 0037673C  83 E1 00 0C */	lwz r31, 0xc(r1)

+/* 8037AAE0 00376740  83 C1 00 08 */	lwz r30, 8(r1)

+/* 8037AAE4 00376744  80 01 00 14 */	lwz r0, 0x14(r1)

+/* 8037AAE8 00376748  7C 08 03 A6 */	mtlr r0

+/* 8037AAEC 0037674C  38 21 00 10 */	addi r1, r1, 0x10

+/* 8037AAF0 00376750  4E 80 00 20 */	blr

+

+.global Create__Q34nw4r3snd9SoundHeapFPvUl

+Create__Q34nw4r3snd9SoundHeapFPvUl:

+/* 8037AAF4 00376754  38 63 00 1C */	addi r3, r3, 0x1c

+/* 8037AAF8 00376758  4B FF 56 9C */	b Create__Q44nw4r3snd6detail9FrameHeapFPvUl

+

+.global Destroy__Q34nw4r3snd9SoundHeapFv

+Destroy__Q34nw4r3snd9SoundHeapFv:

+/* 8037AAFC 0037675C  38 63 00 1C */	addi r3, r3, 0x1c

+/* 8037AB00 00376760  4B FF 58 30 */	b Destroy__Q44nw4r3snd6detail9FrameHeapFv

+

+.global Alloc__Q34nw4r3snd9SoundHeapFUl

+Alloc__Q34nw4r3snd9SoundHeapFUl:

+/* 8037AB04 00376764  94 21 FF E0 */	stwu r1, -0x20(r1)

+/* 8037AB08 00376768  7C 08 02 A6 */	mflr r0

+/* 8037AB0C 0037676C  90 01 00 24 */	stw r0, 0x24(r1)

+/* 8037AB10 00376770  93 E1 00 1C */	stw r31, 0x1c(r1)

+/* 8037AB14 00376774  3B E3 00 04 */	addi r31, r3, 4

+/* 8037AB18 00376778  93 C1 00 18 */	stw r30, 0x18(r1)

+/* 8037AB1C 0037677C  7C 9E 23 78 */	mr r30, r4

+/* 8037AB20 00376780  93 A1 00 14 */	stw r29, 0x14(r1)

+/* 8037AB24 00376784  7C 7D 1B 78 */	mr r29, r3

+/* 8037AB28 00376788  7F E3 FB 78 */	mr r3, r31

+/* 8037AB2C 0037678C  4B EF 4E 1D */	bl func_8026F948

+/* 8037AB30 00376790  3C A0 80 38 */	lis r5, DisposeCallbackFunc__Q34nw4r3snd9SoundHeapFPvUlPv@ha

+/* 8037AB34 00376794  7F C4 F3 78 */	mr r4, r30

+/* 8037AB38 00376798  38 7D 00 1C */	addi r3, r29, 0x1c

+/* 8037AB3C 0037679C  38 C0 00 00 */	li r6, 0

+/* 8037AB40 003767A0  38 A5 AB 74 */	addi r5, r5, DisposeCallbackFunc__Q34nw4r3snd9SoundHeapFPvUlPv@l

+/* 8037AB44 003767A4  4B FF 5A 09 */	bl Alloc__Q44nw4r3snd6detail9FrameHeapFUlPFPvUlPv_vPv

+/* 8037AB48 003767A8  7C 7E 1B 78 */	mr r30, r3

+/* 8037AB4C 003767AC  7F E3 FB 78 */	mr r3, r31

+/* 8037AB50 003767B0  4B EF 4E D5 */	bl func_8026FA24

+/* 8037AB54 003767B4  7F C3 F3 78 */	mr r3, r30

+/* 8037AB58 003767B8  83 E1 00 1C */	lwz r31, 0x1c(r1)

+/* 8037AB5C 003767BC  83 C1 00 18 */	lwz r30, 0x18(r1)

+/* 8037AB60 003767C0  83 A1 00 14 */	lwz r29, 0x14(r1)

+/* 8037AB64 003767C4  80 01 00 24 */	lwz r0, 0x24(r1)

+/* 8037AB68 003767C8  7C 08 03 A6 */	mtlr r0

+/* 8037AB6C 003767CC  38 21 00 20 */	addi r1, r1, 0x20

+/* 8037AB70 003767D0  4E 80 00 20 */	blr

+

+.global DisposeCallbackFunc__Q34nw4r3snd9SoundHeapFPvUlPv

+DisposeCallbackFunc__Q34nw4r3snd9SoundHeapFPvUlPv:

+/* 8037AB74 003767D4  94 21 FF E0 */	stwu r1, -0x20(r1)

+/* 8037AB78 003767D8  7C 08 02 A6 */	mflr r0

+/* 8037AB7C 003767DC  90 01 00 24 */	stw r0, 0x24(r1)

+/* 8037AB80 003767E0  93 E1 00 1C */	stw r31, 0x1c(r1)

+/* 8037AB84 003767E4  7C BF 2B 78 */	mr r31, r5

+/* 8037AB88 003767E8  93 C1 00 18 */	stw r30, 0x18(r1)

+/* 8037AB8C 003767EC  7C 9E 23 78 */	mr r30, r4

+/* 8037AB90 003767F0  93 A1 00 14 */	stw r29, 0x14(r1)

+/* 8037AB94 003767F4  7C 7D 1B 78 */	mr r29, r3

+/* 8037AB98 003767F8  4B FF 46 C1 */	bl GetInstance__Q44nw4r3snd6detail22DisposeCallbackManagerFv

+/* 8037AB9C 003767FC  7F A4 EB 78 */	mr r4, r29

+/* 8037ABA0 00376800  7F C5 F3 78 */	mr r5, r30

+/* 8037ABA4 00376804  7F E6 FB 78 */	mr r6, r31

+/* 8037ABA8 00376808  4B FF 48 51 */	bl Dispose__Q44nw4r3snd6detail22DisposeCallbackManagerFPvUlPv

+/* 8037ABAC 0037680C  4B FF 46 AD */	bl GetInstance__Q44nw4r3snd6detail22DisposeCallbackManagerFv

+/* 8037ABB0 00376810  7F A4 EB 78 */	mr r4, r29

+/* 8037ABB4 00376814  7F C5 F3 78 */	mr r5, r30

+/* 8037ABB8 00376818  7F E6 FB 78 */	mr r6, r31

+/* 8037ABBC 0037681C  4B FF 49 85 */	bl DisposeWave__Q44nw4r3snd6detail22DisposeCallbackManagerFPvUlPv

+/* 8037ABC0 00376820  80 01 00 24 */	lwz r0, 0x24(r1)

+/* 8037ABC4 00376824  83 E1 00 1C */	lwz r31, 0x1c(r1)

+/* 8037ABC8 00376828  83 C1 00 18 */	lwz r30, 0x18(r1)

+/* 8037ABCC 0037682C  83 A1 00 14 */	lwz r29, 0x14(r1)

+/* 8037ABD0 00376830  7C 08 03 A6 */	mtlr r0

+/* 8037ABD4 00376834  38 21 00 20 */	addi r1, r1, 0x20

+/* 8037ABD8 00376838  4E 80 00 20 */	blr

diff --git a/asm/text_10_6.s b/asm/text_10_6.s
index f584719..05fa746 100644
--- a/asm/text_10_6.s
+++ b/asm/text_10_6.s
@@ -2,124 +2,6 @@
 

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

 

-.global func_8037AA3C

-func_8037AA3C:

-/* 8037AA3C 0037669C  94 21 FF F0 */	stwu r1, -0x10(r1)

-/* 8037AA40 003766A0  7C 08 02 A6 */	mflr r0

-/* 8037AA44 003766A4  3C 80 80 45 */	lis r4, lbl_8044CEC8@ha

-/* 8037AA48 003766A8  90 01 00 14 */	stw r0, 0x14(r1)

-/* 8037AA4C 003766AC  38 84 CE C8 */	addi r4, r4, lbl_8044CEC8@l

-/* 8037AA50 003766B0  93 E1 00 0C */	stw r31, 0xc(r1)

-/* 8037AA54 003766B4  7C 7F 1B 78 */	mr r31, r3

-/* 8037AA58 003766B8  90 83 00 00 */	stw r4, 0(r3)

-/* 8037AA5C 003766BC  38 63 00 1C */	addi r3, r3, 0x1c

-/* 8037AA60 003766C0  4B FF 55 FD */	bl __ct__Q44nw4r3snd6detail9FrameHeapFv

-/* 8037AA64 003766C4  38 7F 00 04 */	addi r3, r31, 4

-/* 8037AA68 003766C8  4B EF 4E A9 */	bl func_8026F910

-/* 8037AA6C 003766CC  7F E3 FB 78 */	mr r3, r31

-/* 8037AA70 003766D0  83 E1 00 0C */	lwz r31, 0xc(r1)

-/* 8037AA74 003766D4  80 01 00 14 */	lwz r0, 0x14(r1)

-/* 8037AA78 003766D8  7C 08 03 A6 */	mtlr r0

-/* 8037AA7C 003766DC  38 21 00 10 */	addi r1, r1, 0x10

-/* 8037AA80 003766E0  4E 80 00 20 */	blr

-

-.global func_8037AA84

-func_8037AA84:

-/* 8037AA84 003766E4  94 21 FF F0 */	stwu r1, -0x10(r1)

-/* 8037AA88 003766E8  7C 08 02 A6 */	mflr r0

-/* 8037AA8C 003766EC  2C 03 00 00 */	cmpwi r3, 0

-/* 8037AA90 003766F0  90 01 00 14 */	stw r0, 0x14(r1)

-/* 8037AA94 003766F4  93 E1 00 0C */	stw r31, 0xc(r1)

-/* 8037AA98 003766F8  7C 9F 23 78 */	mr r31, r4

-/* 8037AA9C 003766FC  93 C1 00 08 */	stw r30, 8(r1)

-/* 8037AAA0 00376700  7C 7E 1B 78 */	mr r30, r3

-/* 8037AAA4 00376704  41 82 00 34 */	beq lbl_8037AAD8

-/* 8037AAA8 00376708  3C 80 80 45 */	lis r4, lbl_8044CEC8@ha

-/* 8037AAAC 0037670C  38 84 CE C8 */	addi r4, r4, lbl_8044CEC8@l

-/* 8037AAB0 00376710  90 83 00 00 */	stw r4, 0(r3)

-/* 8037AAB4 00376714  38 63 00 1C */	addi r3, r3, 0x1c

-/* 8037AAB8 00376718  4B FF 58 79 */	bl Destroy__Q44nw4r3snd6detail9FrameHeapFv

-/* 8037AABC 0037671C  38 7E 00 1C */	addi r3, r30, 0x1c

-/* 8037AAC0 00376720  38 80 FF FF */	li r4, -1

-/* 8037AAC4 00376724  4B FF 55 BD */	bl __dt__Q44nw4r3snd6detail9FrameHeapFv

-/* 8037AAC8 00376728  2C 1F 00 00 */	cmpwi r31, 0

-/* 8037AACC 0037672C  40 81 00 0C */	ble lbl_8037AAD8

-/* 8037AAD0 00376730  7F C3 F3 78 */	mr r3, r30

-/* 8037AAD4 00376734  4B E5 FF E5 */	bl func_801DAAB8

-lbl_8037AAD8:

-/* 8037AAD8 00376738  7F C3 F3 78 */	mr r3, r30

-/* 8037AADC 0037673C  83 E1 00 0C */	lwz r31, 0xc(r1)

-/* 8037AAE0 00376740  83 C1 00 08 */	lwz r30, 8(r1)

-/* 8037AAE4 00376744  80 01 00 14 */	lwz r0, 0x14(r1)

-/* 8037AAE8 00376748  7C 08 03 A6 */	mtlr r0

-/* 8037AAEC 0037674C  38 21 00 10 */	addi r1, r1, 0x10

-/* 8037AAF0 00376750  4E 80 00 20 */	blr

-

-.global func_8037AAF4

-func_8037AAF4:

-/* 8037AAF4 00376754  38 63 00 1C */	addi r3, r3, 0x1c

-/* 8037AAF8 00376758  4B FF 56 9C */	b Create__Q44nw4r3snd6detail9FrameHeapFPvUl

-

-.global func_8037AAFC

-func_8037AAFC:

-/* 8037AAFC 0037675C  38 63 00 1C */	addi r3, r3, 0x1c

-/* 8037AB00 00376760  4B FF 58 30 */	b Destroy__Q44nw4r3snd6detail9FrameHeapFv

-/* 8037AB04 00376764  94 21 FF E0 */	stwu r1, -0x20(r1)

-/* 8037AB08 00376768  7C 08 02 A6 */	mflr r0

-/* 8037AB0C 0037676C  90 01 00 24 */	stw r0, 0x24(r1)

-/* 8037AB10 00376770  93 E1 00 1C */	stw r31, 0x1c(r1)

-/* 8037AB14 00376774  3B E3 00 04 */	addi r31, r3, 4

-/* 8037AB18 00376778  93 C1 00 18 */	stw r30, 0x18(r1)

-/* 8037AB1C 0037677C  7C 9E 23 78 */	mr r30, r4

-/* 8037AB20 00376780  93 A1 00 14 */	stw r29, 0x14(r1)

-/* 8037AB24 00376784  7C 7D 1B 78 */	mr r29, r3

-/* 8037AB28 00376788  7F E3 FB 78 */	mr r3, r31

-/* 8037AB2C 0037678C  4B EF 4E 1D */	bl func_8026F948

-/* 8037AB30 00376790  3C A0 80 38 */	lis r5, lbl_8037AB74@ha

-/* 8037AB34 00376794  7F C4 F3 78 */	mr r4, r30

-/* 8037AB38 00376798  38 7D 00 1C */	addi r3, r29, 0x1c

-/* 8037AB3C 0037679C  38 C0 00 00 */	li r6, 0

-/* 8037AB40 003767A0  38 A5 AB 74 */	addi r5, r5, lbl_8037AB74@l

-/* 8037AB44 003767A4  4B FF 5A 09 */	bl Alloc__Q44nw4r3snd6detail9FrameHeapFUlPFPvUlPv_vPv

-/* 8037AB48 003767A8  7C 7E 1B 78 */	mr r30, r3

-/* 8037AB4C 003767AC  7F E3 FB 78 */	mr r3, r31

-/* 8037AB50 003767B0  4B EF 4E D5 */	bl func_8026FA24

-/* 8037AB54 003767B4  7F C3 F3 78 */	mr r3, r30

-/* 8037AB58 003767B8  83 E1 00 1C */	lwz r31, 0x1c(r1)

-/* 8037AB5C 003767BC  83 C1 00 18 */	lwz r30, 0x18(r1)

-/* 8037AB60 003767C0  83 A1 00 14 */	lwz r29, 0x14(r1)

-/* 8037AB64 003767C4  80 01 00 24 */	lwz r0, 0x24(r1)

-/* 8037AB68 003767C8  7C 08 03 A6 */	mtlr r0

-/* 8037AB6C 003767CC  38 21 00 20 */	addi r1, r1, 0x20

-/* 8037AB70 003767D0  4E 80 00 20 */	blr

-lbl_8037AB74:

-/* 8037AB74 003767D4  94 21 FF E0 */	stwu r1, -0x20(r1)

-/* 8037AB78 003767D8  7C 08 02 A6 */	mflr r0

-/* 8037AB7C 003767DC  90 01 00 24 */	stw r0, 0x24(r1)

-/* 8037AB80 003767E0  93 E1 00 1C */	stw r31, 0x1c(r1)

-/* 8037AB84 003767E4  7C BF 2B 78 */	mr r31, r5

-/* 8037AB88 003767E8  93 C1 00 18 */	stw r30, 0x18(r1)

-/* 8037AB8C 003767EC  7C 9E 23 78 */	mr r30, r4

-/* 8037AB90 003767F0  93 A1 00 14 */	stw r29, 0x14(r1)

-/* 8037AB94 003767F4  7C 7D 1B 78 */	mr r29, r3

-/* 8037AB98 003767F8  4B FF 46 C1 */	bl GetInstance__Q44nw4r3snd6detail22DisposeCallbackManagerFv

-/* 8037AB9C 003767FC  7F A4 EB 78 */	mr r4, r29

-/* 8037ABA0 00376800  7F C5 F3 78 */	mr r5, r30

-/* 8037ABA4 00376804  7F E6 FB 78 */	mr r6, r31

-/* 8037ABA8 00376808  4B FF 48 51 */	bl Dispose__Q44nw4r3snd6detail22DisposeCallbackManagerFPvUlPv

-/* 8037ABAC 0037680C  4B FF 46 AD */	bl GetInstance__Q44nw4r3snd6detail22DisposeCallbackManagerFv

-/* 8037ABB0 00376810  7F A4 EB 78 */	mr r4, r29

-/* 8037ABB4 00376814  7F C5 F3 78 */	mr r5, r30

-/* 8037ABB8 00376818  7F E6 FB 78 */	mr r6, r31

-/* 8037ABBC 0037681C  4B FF 49 85 */	bl DisposeWave__Q44nw4r3snd6detail22DisposeCallbackManagerFPvUlPv

-/* 8037ABC0 00376820  80 01 00 24 */	lwz r0, 0x24(r1)

-/* 8037ABC4 00376824  83 E1 00 1C */	lwz r31, 0x1c(r1)

-/* 8037ABC8 00376828  83 C1 00 18 */	lwz r30, 0x18(r1)

-/* 8037ABCC 0037682C  83 A1 00 14 */	lwz r29, 0x14(r1)

-/* 8037ABD0 00376830  7C 08 03 A6 */	mtlr r0

-/* 8037ABD4 00376834  38 21 00 20 */	addi r1, r1, 0x20

-/* 8037ABD8 00376838  4E 80 00 20 */	blr

-

 .global func_8037ABDC

 func_8037ABDC:

 /* 8037ABDC 0037683C  94 21 FF E0 */	stwu r1, -0x20(r1)

diff --git a/asm/text_11.s b/asm/text_11.s
index b2845ad..c18d46f 100644
--- a/asm/text_11.s
+++ b/asm/text_11.s
@@ -40244,7 +40244,7 @@ lbl_803A34E0:
 /* 803A34F8 0039F158  2C 03 00 00 */	cmpwi r3, 0
 /* 803A34FC 0039F15C  41 82 00 10 */	beq lbl_803A350C
 /* 803A3500 0039F160  41 82 00 08 */	beq lbl_803A3508
-/* 803A3504 0039F164  4B FD 75 39 */	bl func_8037AA3C
+/* 803A3504 0039F164  4B FD 75 39 */	bl __ct__Q34nw4r3snd9SoundHeapFv
 lbl_803A3508:
 /* 803A3508 0039F168  90 79 05 E0 */	stw r3, 0x5e0(r25)
 lbl_803A350C:
@@ -40262,7 +40262,7 @@ lbl_803A3524:
 /* 803A3534 0039F194  7C 64 1B 78 */	mr r4, r3
 /* 803A3538 0039F198  80 79 05 E0 */	lwz r3, 0x5e0(r25)
 /* 803A353C 0039F19C  7F E5 FB 78 */	mr r5, r31
-/* 803A3540 0039F1A0  4B FD 75 B5 */	bl func_8037AAF4
+/* 803A3540 0039F1A0  4B FD 75 B5 */	bl Create__Q34nw4r3snd9SoundHeapFPvUl
 /* 803A3544 0039F1A4  80 79 05 D0 */	lwz r3, 0x5d0(r25)
 /* 803A3548 0039F1A8  38 80 00 00 */	li r4, 0
 /* 803A354C 0039F1AC  80 B9 05 E0 */	lwz r5, 0x5e0(r25)
@@ -40328,7 +40328,7 @@ lbl_803A361C:
 /* 803A361C 0039F27C  80 7E 05 E0 */	lwz r3, 0x5e0(r30)
 /* 803A3620 0039F280  2C 03 00 00 */	cmpwi r3, 0
 /* 803A3624 0039F284  41 82 00 20 */	beq lbl_803A3644
-/* 803A3628 0039F288  4B FD 74 D5 */	bl func_8037AAFC
+/* 803A3628 0039F288  4B FD 74 D5 */	bl Destroy__Q34nw4r3snd9SoundHeapFv
 /* 803A362C 0039F28C  80 7E 05 E0 */	lwz r3, 0x5e0(r30)
 /* 803A3630 0039F290  38 80 FF FF */	li r4, -1
 /* 803A3634 0039F294  81 83 00 00 */	lwz r12, 0(r3)
diff --git a/asm/text_7.s b/asm/text_7.s
index 9c22019..ecf2ed3 100644
--- a/asm/text_7.s
+++ b/asm/text_7.s
@@ -57432,12 +57432,12 @@ lbl_8025474C:
 /* 80254750 002503B0  90 7E 00 04 */	stw r3, 4(r30)
 /* 80254754 002503B4  38 64 00 10 */	addi r3, r4, 0x10
 /* 80254758 002503B8  4B F8 63 1D */	bl func_801DAA74
-/* 8025475C 002503BC  3C 80 80 38 */	lis r4, func_8037AA3C@ha
-/* 80254760 002503C0  3C A0 80 38 */	lis r5, func_8037AA84@ha
+/* 8025475C 002503BC  3C 80 80 38 */	lis r4, __ct__Q34nw4r3snd9SoundHeapFv@ha
+/* 80254760 002503C0  3C A0 80 38 */	lis r5, __dt__Q34nw4r3snd9SoundHeapFv@ha
 /* 80254764 002503C4  7F 07 C3 78 */	mr r7, r24
 /* 80254768 002503C8  38 C0 00 2C */	li r6, 0x2c
-/* 8025476C 002503CC  38 84 AA 3C */	addi r4, r4, func_8037AA3C@l
-/* 80254770 002503D0  38 A5 AA 84 */	addi r5, r5, func_8037AA84@l
+/* 8025476C 002503CC  38 84 AA 3C */	addi r4, r4, __ct__Q34nw4r3snd9SoundHeapFv@l
+/* 80254770 002503D0  38 A5 AA 84 */	addi r5, r5, __dt__Q34nw4r3snd9SoundHeapFv@l
 /* 80254774 002503D4  4B F7 25 35 */	bl __construct_new_array
 /* 80254778 002503D8  90 7E 00 08 */	stw r3, 8(r30)
 /* 8025477C 002503DC  38 60 00 28 */	li r3, 0x28
@@ -57540,7 +57540,7 @@ lbl_802548CC:
 /* 802548E0 00250540  7C 64 1B 78 */	mr r4, r3
 /* 802548E4 00250544  7E E5 BB 78 */	mr r5, r23
 /* 802548E8 00250548  7C 60 D2 14 */	add r3, r0, r26
-/* 802548EC 0025054C  48 12 62 09 */	bl func_8037AAF4
+/* 802548EC 0025054C  48 12 62 09 */	bl Create__Q34nw4r3snd9SoundHeapFPvUl
 /* 802548F0 00250550  80 1E 00 08 */	lwz r0, 8(r30)
 /* 802548F4 00250554  7C 60 D2 14 */	add r3, r0, r26
 /* 802548F8 00250558  80 03 00 1C */	lwz r0, 0x1c(r3)
diff --git a/obj_files.mk b/obj_files.mk
index 1e32076..83ceac4 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -144,6 +144,7 @@ TEXT_O_FILES := 						                          \
 	$(BUILD_DIR)/asm/nw4r/snd/detail/snd_SoundArchiveLoader.o         \
 	$(BUILD_DIR)/asm/nw4r/snd/snd_SoundArchivePlayer.o                \
 	$(BUILD_DIR)/asm/nw4r/snd/snd_SoundHandle.o                       \
+	$(BUILD_DIR)/asm/nw4r/snd/snd_SoundHeap.o                         \
 	$(BUILD_DIR)/asm/text_10_6.o                                      \
 	$(BUILD_DIR)/asm/text_11.o