split snd_SoundHandle.s

8 files changed, 142 insertions, 138 deletions

diff --git a/asm/nw4r/snd/detail/snd_BasicSound.s b/asm/nw4r/snd/detail/snd_BasicSound.s
index 874a22d..32ac4bc 100644
--- a/asm/nw4r/snd/detail/snd_BasicSound.s
+++ b/asm/nw4r/snd/detail/snd_BasicSound.s
@@ -928,12 +928,12 @@ lbl_8036DCE8:
 /* 8036DD08 00369968  80 7E 00 08 */	lwz r3, 8(r30)

 /* 8036DD0C 0036996C  2C 03 00 00 */	cmpwi r3, 0

 /* 8036DD10 00369970  41 82 00 08 */	beq lbl_8036DD18

-/* 8036DD14 00369974  48 00 CC D9 */	bl func_8037A9EC

+/* 8036DD14 00369974  48 00 CC D9 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv

 lbl_8036DD18:

 /* 8036DD18 00369978  80 7E 00 0C */	lwz r3, 0xc(r30)

 /* 8036DD1C 0036997C  2C 03 00 00 */	cmpwi r3, 0

 /* 8036DD20 00369980  41 82 00 08 */	beq lbl_8036DD28

-/* 8036DD24 00369984  48 00 CC C9 */	bl func_8037A9EC

+/* 8036DD24 00369984  48 00 CC C9 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv

 lbl_8036DD28:

 /* 8036DD28 00369988  81 9E 00 00 */	lwz r12, 0(r30)

 /* 8036DD2C 0036998C  7F C3 F3 78 */	mr r3, r30

@@ -1242,12 +1242,12 @@ IsAttachedTempGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv:
 .global DetachGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv

 DetachGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv:

 /* 8036E0F4 00369D54  80 63 00 08 */	lwz r3, 8(r3)

-/* 8036E0F8 00369D58  48 00 C8 F4 */	b func_8037A9EC

+/* 8036E0F8 00369D58  48 00 C8 F4 */	b DetachSound__Q34nw4r3snd11SoundHandleFv

 

 .global DetachTempGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv

 DetachTempGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv:

 /* 8036E0FC 00369D5C  80 63 00 0C */	lwz r3, 0xc(r3)

-/* 8036E100 00369D60  48 00 C8 EC */	b func_8037A9EC

+/* 8036E100 00369D60  48 00 C8 EC */	b DetachSound__Q34nw4r3snd11SoundHandleFv

 

 .global SetId__Q44nw4r3snd6detail10BasicSoundFUl

 SetId__Q44nw4r3snd6detail10BasicSoundFUl:

diff --git a/asm/nw4r/snd/snd_Sound3DManager.s b/asm/nw4r/snd/snd_Sound3DManager.s
index 34f8b71..29a669d 100644
--- a/asm/nw4r/snd/snd_Sound3DManager.s
+++ b/asm/nw4r/snd/snd_Sound3DManager.s
@@ -85,7 +85,7 @@ detail_Update__Q34nw4r3snd14Sound3DManagerFPQ34nw4r3snd10SoundParamUlPQ44nw4r3sn
 /* 8037668C 003722EC  41 82 00 10 */	beq lbl_8037669C

 /* 80376690 003722F0  7F E4 FB 78 */	mr r4, r31

 /* 80376694 003722F4  38 61 00 08 */	addi r3, r1, 8

-/* 80376698 003722F8  48 00 42 8D */	bl func_8037A924

+/* 80376698 003722F8  48 00 42 8D */	bl detail_AttachSoundAsTempHandle__Q34nw4r3snd11SoundHandleFPQ44nw4r3snd6detail10BasicSound

 lbl_8037669C:

 /* 8037669C 003722FC  81 9A 00 00 */	lwz r12, 0(r26)

 /* 803766A0 00372300  7C 1F 00 D0 */	neg r0, r31

@@ -102,7 +102,7 @@ lbl_8037669C:
 /* 803766CC 0037232C  7D 89 03 A6 */	mtctr r12

 /* 803766D0 00372330  4E 80 04 21 */	bctrl

 /* 803766D4 00372334  7F E3 FB 78 */	mr r3, r31

-/* 803766D8 00372338  48 00 43 15 */	bl func_8037A9EC

+/* 803766D8 00372338  48 00 43 15 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv

 /* 803766DC 0037233C  39 61 00 30 */	addi r11, r1, 0x30

 /* 803766E0 00372340  4B E5 0A 91 */	bl func_801C7170

 /* 803766E4 00372344  80 01 00 34 */	lwz r0, 0x34(r1)

diff --git a/asm/nw4r/snd/snd_SoundArchivePlayer.s b/asm/nw4r/snd/snd_SoundArchivePlayer.s
index 382b643..c3156ae 100644
--- a/asm/nw4r/snd/snd_SoundArchivePlayer.s
+++ b/asm/nw4r/snd/snd_SoundArchivePlayer.s
@@ -1330,7 +1330,7 @@ lbl_80379BB0:
 /* 80379BB4 00375814  2C 00 00 00 */	cmpwi r0, 0

 /* 80379BB8 00375818  41 82 00 0C */	beq lbl_80379BC4

 /* 80379BBC 0037581C  7F 83 E3 78 */	mr r3, r28

-/* 80379BC0 00375820  48 00 0E 2D */	bl func_8037A9EC

+/* 80379BC0 00375820  48 00 0E 2D */	bl DetachSound__Q34nw4r3snd11SoundHandleFv

 lbl_80379BC4:

 /* 80379BC4 00375824  80 7B 00 10 */	lwz r3, 0x10(r27)

 /* 80379BC8 00375828  7F A4 EB 78 */	mr r4, r29

@@ -1523,7 +1523,7 @@ lbl_80379E6C:
 lbl_80379E74:

 /* 80379E74 00375AD4  7F 83 E3 78 */	mr r3, r28

 /* 80379E78 00375AD8  7F 04 C3 78 */	mr r4, r24

-/* 80379E7C 00375ADC  48 00 0B 25 */	bl func_8037A9A0

+/* 80379E7C 00375ADC  48 00 0B 25 */	bl detail_AttachSound__Q34nw4r3snd11SoundHandleFPQ44nw4r3snd6detail10BasicSound

 /* 80379E80 00375AE0  38 60 00 00 */	li r3, 0

 lbl_80379E84:

 /* 80379E84 00375AE4  39 61 00 70 */	addi r11, r1, 0x70

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

+

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

+

+.global detail_AttachSoundAsTempHandle__Q34nw4r3snd11SoundHandleFPQ44nw4r3snd6detail10BasicSound

+detail_AttachSoundAsTempHandle__Q34nw4r3snd11SoundHandleFPQ44nw4r3snd6detail10BasicSound:

+/* 8037A924 00376584  94 21 FF F0 */	stwu r1, -0x10(r1)

+/* 8037A928 00376588  7C 08 02 A6 */	mflr r0

+/* 8037A92C 0037658C  90 01 00 14 */	stw r0, 0x14(r1)

+/* 8037A930 00376590  93 E1 00 0C */	stw r31, 0xc(r1)

+/* 8037A934 00376594  7C 7F 1B 78 */	mr r31, r3

+/* 8037A938 00376598  90 83 00 00 */	stw r4, 0(r3)

+/* 8037A93C 0037659C  7C 83 23 78 */	mr r3, r4

+/* 8037A940 003765A0  4B FF 37 A1 */	bl IsAttachedTempGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv

+/* 8037A944 003765A4  2C 03 00 00 */	cmpwi r3, 0

+/* 8037A948 003765A8  41 82 00 0C */	beq lbl_8037A954

+/* 8037A94C 003765AC  80 7F 00 00 */	lwz r3, 0(r31)

+/* 8037A950 003765B0  4B FF 37 AD */	bl DetachTempGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv

+lbl_8037A954:

+/* 8037A954 003765B4  80 7F 00 00 */	lwz r3, 0(r31)

+/* 8037A958 003765B8  81 83 00 00 */	lwz r12, 0(r3)

+/* 8037A95C 003765BC  81 8C 00 5C */	lwz r12, 0x5c(r12)

+/* 8037A960 003765C0  7D 89 03 A6 */	mtctr r12

+/* 8037A964 003765C4  4E 80 04 21 */	bctrl

+/* 8037A968 003765C8  2C 03 00 00 */	cmpwi r3, 0

+/* 8037A96C 003765CC  41 82 00 18 */	beq lbl_8037A984

+/* 8037A970 003765D0  80 7F 00 00 */	lwz r3, 0(r31)

+/* 8037A974 003765D4  81 83 00 00 */	lwz r12, 0(r3)

+/* 8037A978 003765D8  81 8C 00 60 */	lwz r12, 0x60(r12)

+/* 8037A97C 003765DC  7D 89 03 A6 */	mtctr r12

+/* 8037A980 003765E0  4E 80 04 21 */	bctrl

+lbl_8037A984:

+/* 8037A984 003765E4  80 7F 00 00 */	lwz r3, 0(r31)

+/* 8037A988 003765E8  93 E3 00 0C */	stw r31, 0xc(r3)

+/* 8037A98C 003765EC  83 E1 00 0C */	lwz r31, 0xc(r1)

+/* 8037A990 003765F0  80 01 00 14 */	lwz r0, 0x14(r1)

+/* 8037A994 003765F4  7C 08 03 A6 */	mtlr r0

+/* 8037A998 003765F8  38 21 00 10 */	addi r1, r1, 0x10

+/* 8037A99C 003765FC  4E 80 00 20 */	blr

+

+.global detail_AttachSound__Q34nw4r3snd11SoundHandleFPQ44nw4r3snd6detail10BasicSound

+detail_AttachSound__Q34nw4r3snd11SoundHandleFPQ44nw4r3snd6detail10BasicSound:

+/* 8037A9A0 00376600  94 21 FF F0 */	stwu r1, -0x10(r1)

+/* 8037A9A4 00376604  7C 08 02 A6 */	mflr r0

+/* 8037A9A8 00376608  90 01 00 14 */	stw r0, 0x14(r1)

+/* 8037A9AC 0037660C  93 E1 00 0C */	stw r31, 0xc(r1)

+/* 8037A9B0 00376610  7C 7F 1B 78 */	mr r31, r3

+/* 8037A9B4 00376614  90 83 00 00 */	stw r4, 0(r3)

+/* 8037A9B8 00376618  7C 83 23 78 */	mr r3, r4

+/* 8037A9BC 0037661C  4B FF 37 11 */	bl IsAttachedGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv

+/* 8037A9C0 00376620  2C 03 00 00 */	cmpwi r3, 0

+/* 8037A9C4 00376624  41 82 00 0C */	beq lbl_8037A9D0

+/* 8037A9C8 00376628  80 7F 00 00 */	lwz r3, 0(r31)

+/* 8037A9CC 0037662C  4B FF 37 29 */	bl DetachGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv

+lbl_8037A9D0:

+/* 8037A9D0 00376630  80 7F 00 00 */	lwz r3, 0(r31)

+/* 8037A9D4 00376634  93 E3 00 08 */	stw r31, 8(r3)

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

+/* 8037A9DC 0037663C  80 01 00 14 */	lwz r0, 0x14(r1)

+/* 8037A9E0 00376640  7C 08 03 A6 */	mtlr r0

+/* 8037A9E4 00376644  38 21 00 10 */	addi r1, r1, 0x10

+/* 8037A9E8 00376648  4E 80 00 20 */	blr

+

+.global DetachSound__Q34nw4r3snd11SoundHandleFv

+DetachSound__Q34nw4r3snd11SoundHandleFv:

+/* 8037A9EC 0037664C  80 83 00 00 */	lwz r4, 0(r3)

+/* 8037A9F0 00376650  2C 04 00 00 */	cmpwi r4, 0

+/* 8037A9F4 00376654  41 82 00 30 */	beq lbl_8037AA24

+/* 8037A9F8 00376658  80 04 00 08 */	lwz r0, 8(r4)

+/* 8037A9FC 0037665C  7C 00 18 40 */	cmplw r0, r3

+/* 8037AA00 00376660  40 82 00 0C */	bne lbl_8037AA0C

+/* 8037AA04 00376664  38 00 00 00 */	li r0, 0

+/* 8037AA08 00376668  90 04 00 08 */	stw r0, 8(r4)

+lbl_8037AA0C:

+/* 8037AA0C 0037666C  80 83 00 00 */	lwz r4, 0(r3)

+/* 8037AA10 00376670  80 04 00 0C */	lwz r0, 0xc(r4)

+/* 8037AA14 00376674  7C 00 18 40 */	cmplw r0, r3

+/* 8037AA18 00376678  40 82 00 0C */	bne lbl_8037AA24

+/* 8037AA1C 0037667C  38 00 00 00 */	li r0, 0

+/* 8037AA20 00376680  90 04 00 0C */	stw r0, 0xc(r4)

+lbl_8037AA24:

+/* 8037AA24 00376684  80 03 00 00 */	lwz r0, 0(r3)

+/* 8037AA28 00376688  2C 00 00 00 */	cmpwi r0, 0

+/* 8037AA2C 0037668C  4D 82 00 20 */	beqlr

+/* 8037AA30 00376690  38 00 00 00 */	li r0, 0

+/* 8037AA34 00376694  90 03 00 00 */	stw r0, 0(r3)

+/* 8037AA38 00376698  4E 80 00 20 */	blr

diff --git a/asm/text_10_6.s b/asm/text_10_6.s
index 3de37c1..f584719 100644
--- a/asm/text_10_6.s
+++ b/asm/text_10_6.s
@@ -2,90 +2,6 @@
 

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

 

-.global func_8037A924

-func_8037A924:

-/* 8037A924 00376584  94 21 FF F0 */	stwu r1, -0x10(r1)

-/* 8037A928 00376588  7C 08 02 A6 */	mflr r0

-/* 8037A92C 0037658C  90 01 00 14 */	stw r0, 0x14(r1)

-/* 8037A930 00376590  93 E1 00 0C */	stw r31, 0xc(r1)

-/* 8037A934 00376594  7C 7F 1B 78 */	mr r31, r3

-/* 8037A938 00376598  90 83 00 00 */	stw r4, 0(r3)

-/* 8037A93C 0037659C  7C 83 23 78 */	mr r3, r4

-/* 8037A940 003765A0  4B FF 37 A1 */	bl IsAttachedTempGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv

-/* 8037A944 003765A4  2C 03 00 00 */	cmpwi r3, 0

-/* 8037A948 003765A8  41 82 00 0C */	beq lbl_8037A954

-/* 8037A94C 003765AC  80 7F 00 00 */	lwz r3, 0(r31)

-/* 8037A950 003765B0  4B FF 37 AD */	bl DetachTempGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv

-lbl_8037A954:

-/* 8037A954 003765B4  80 7F 00 00 */	lwz r3, 0(r31)

-/* 8037A958 003765B8  81 83 00 00 */	lwz r12, 0(r3)

-/* 8037A95C 003765BC  81 8C 00 5C */	lwz r12, 0x5c(r12)

-/* 8037A960 003765C0  7D 89 03 A6 */	mtctr r12

-/* 8037A964 003765C4  4E 80 04 21 */	bctrl

-/* 8037A968 003765C8  2C 03 00 00 */	cmpwi r3, 0

-/* 8037A96C 003765CC  41 82 00 18 */	beq lbl_8037A984

-/* 8037A970 003765D0  80 7F 00 00 */	lwz r3, 0(r31)

-/* 8037A974 003765D4  81 83 00 00 */	lwz r12, 0(r3)

-/* 8037A978 003765D8  81 8C 00 60 */	lwz r12, 0x60(r12)

-/* 8037A97C 003765DC  7D 89 03 A6 */	mtctr r12

-/* 8037A980 003765E0  4E 80 04 21 */	bctrl

-lbl_8037A984:

-/* 8037A984 003765E4  80 7F 00 00 */	lwz r3, 0(r31)

-/* 8037A988 003765E8  93 E3 00 0C */	stw r31, 0xc(r3)

-/* 8037A98C 003765EC  83 E1 00 0C */	lwz r31, 0xc(r1)

-/* 8037A990 003765F0  80 01 00 14 */	lwz r0, 0x14(r1)

-/* 8037A994 003765F4  7C 08 03 A6 */	mtlr r0

-/* 8037A998 003765F8  38 21 00 10 */	addi r1, r1, 0x10

-/* 8037A99C 003765FC  4E 80 00 20 */	blr

-

-.global func_8037A9A0

-func_8037A9A0:

-/* 8037A9A0 00376600  94 21 FF F0 */	stwu r1, -0x10(r1)

-/* 8037A9A4 00376604  7C 08 02 A6 */	mflr r0

-/* 8037A9A8 00376608  90 01 00 14 */	stw r0, 0x14(r1)

-/* 8037A9AC 0037660C  93 E1 00 0C */	stw r31, 0xc(r1)

-/* 8037A9B0 00376610  7C 7F 1B 78 */	mr r31, r3

-/* 8037A9B4 00376614  90 83 00 00 */	stw r4, 0(r3)

-/* 8037A9B8 00376618  7C 83 23 78 */	mr r3, r4

-/* 8037A9BC 0037661C  4B FF 37 11 */	bl IsAttachedGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv

-/* 8037A9C0 00376620  2C 03 00 00 */	cmpwi r3, 0

-/* 8037A9C4 00376624  41 82 00 0C */	beq lbl_8037A9D0

-/* 8037A9C8 00376628  80 7F 00 00 */	lwz r3, 0(r31)

-/* 8037A9CC 0037662C  4B FF 37 29 */	bl DetachGeneralHandle__Q44nw4r3snd6detail10BasicSoundFv

-lbl_8037A9D0:

-/* 8037A9D0 00376630  80 7F 00 00 */	lwz r3, 0(r31)

-/* 8037A9D4 00376634  93 E3 00 08 */	stw r31, 8(r3)

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

-/* 8037A9DC 0037663C  80 01 00 14 */	lwz r0, 0x14(r1)

-/* 8037A9E0 00376640  7C 08 03 A6 */	mtlr r0

-/* 8037A9E4 00376644  38 21 00 10 */	addi r1, r1, 0x10

-/* 8037A9E8 00376648  4E 80 00 20 */	blr

-

-.global func_8037A9EC

-func_8037A9EC:

-/* 8037A9EC 0037664C  80 83 00 00 */	lwz r4, 0(r3)

-/* 8037A9F0 00376650  2C 04 00 00 */	cmpwi r4, 0

-/* 8037A9F4 00376654  41 82 00 30 */	beq lbl_8037AA24

-/* 8037A9F8 00376658  80 04 00 08 */	lwz r0, 8(r4)

-/* 8037A9FC 0037665C  7C 00 18 40 */	cmplw r0, r3

-/* 8037AA00 00376660  40 82 00 0C */	bne lbl_8037AA0C

-/* 8037AA04 00376664  38 00 00 00 */	li r0, 0

-/* 8037AA08 00376668  90 04 00 08 */	stw r0, 8(r4)

-lbl_8037AA0C:

-/* 8037AA0C 0037666C  80 83 00 00 */	lwz r4, 0(r3)

-/* 8037AA10 00376670  80 04 00 0C */	lwz r0, 0xc(r4)

-/* 8037AA14 00376674  7C 00 18 40 */	cmplw r0, r3

-/* 8037AA18 00376678  40 82 00 0C */	bne lbl_8037AA24

-/* 8037AA1C 0037667C  38 00 00 00 */	li r0, 0

-/* 8037AA20 00376680  90 04 00 0C */	stw r0, 0xc(r4)

-lbl_8037AA24:

-/* 8037AA24 00376684  80 03 00 00 */	lwz r0, 0(r3)

-/* 8037AA28 00376688  2C 00 00 00 */	cmpwi r0, 0

-/* 8037AA2C 0037668C  4D 82 00 20 */	beqlr

-/* 8037AA30 00376690  38 00 00 00 */	li r0, 0

-/* 8037AA34 00376694  90 03 00 00 */	stw r0, 0(r3)

-/* 8037AA38 00376698  4E 80 00 20 */	blr

-

 .global func_8037AA3C

 func_8037AA3C:

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

diff --git a/asm/text_11.s b/asm/text_11.s
index 81d0c4b..b2845ad 100644
--- a/asm/text_11.s
+++ b/asm/text_11.s
@@ -32300,7 +32300,7 @@ lbl_8039C35C:
 /* 8039C384 00397FE4  7F 63 DB 78 */	mr r3, r27
 /* 8039C388 00397FE8  4B ED 35 C1 */	bl func_8026F948
 /* 8039C38C 00397FEC  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 8039C390 00397FF0  4B FD E6 5D */	bl func_8037A9EC
+/* 8039C390 00397FF0  4B FD E6 5D */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039C394 00397FF4  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 8039C398 00397FF8  38 A0 00 00 */	li r5, 0
 /* 8039C39C 00397FFC  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -32695,7 +32695,7 @@ lbl_8039C930:
 /* 8039C958 003985B8  7F 83 E3 78 */	mr r3, r28
 /* 8039C95C 003985BC  4B ED 2F ED */	bl func_8026F948
 /* 8039C960 003985C0  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 8039C964 003985C4  4B FD E0 89 */	bl func_8037A9EC
+/* 8039C964 003985C4  4B FD E0 89 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039C968 003985C8  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 8039C96C 003985CC  38 A0 00 15 */	li r5, 0x15
 /* 8039C970 003985D0  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -32922,7 +32922,7 @@ lbl_8039CC80:
 /* 8039CCA8 00398908  7F 83 E3 78 */	mr r3, r28
 /* 8039CCAC 0039890C  4B ED 2C 9D */	bl func_8026F948
 /* 8039CCB0 00398910  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 8039CCB4 00398914  4B FD DD 39 */	bl func_8037A9EC
+/* 8039CCB4 00398914  4B FD DD 39 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039CCB8 00398918  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 8039CCBC 0039891C  38 A0 00 07 */	li r5, 7
 /* 8039CCC0 00398920  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -34516,7 +34516,7 @@ lbl_8039E32C:
 /* 8039E34C 00399FAC  7F E3 FB 78 */	mr r3, r31
 /* 8039E350 00399FB0  4B ED 15 F9 */	bl func_8026F948
 /* 8039E354 00399FB4  80 6F 05 E4 */	lwz r3, 0x5e4(r15)
-/* 8039E358 00399FB8  4B FD C6 95 */	bl func_8037A9EC
+/* 8039E358 00399FB8  4B FD C6 95 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039E35C 00399FBC  80 6F 05 D0 */	lwz r3, 0x5d0(r15)
 /* 8039E360 00399FC0  38 B1 00 11 */	addi r5, r17, 0x11
 /* 8039E364 00399FC4  80 8F 05 E4 */	lwz r4, 0x5e4(r15)
@@ -34994,7 +34994,7 @@ lbl_8039EA28:
 /* 8039EA50 0039A6B0  7F C3 F3 78 */	mr r3, r30
 /* 8039EA54 0039A6B4  4B ED 0E F5 */	bl func_8026F948
 /* 8039EA58 0039A6B8  80 7F 05 E4 */	lwz r3, 0x5e4(r31)
-/* 8039EA5C 0039A6BC  4B FD BF 91 */	bl func_8037A9EC
+/* 8039EA5C 0039A6BC  4B FD BF 91 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039EA60 0039A6C0  80 7F 05 D0 */	lwz r3, 0x5d0(r31)
 /* 8039EA64 0039A6C4  38 A0 00 08 */	li r5, 8
 /* 8039EA68 0039A6C8  80 9F 05 E4 */	lwz r4, 0x5e4(r31)
@@ -35057,7 +35057,7 @@ lbl_8039EB14:
 /* 8039EB3C 0039A79C  7F C3 F3 78 */	mr r3, r30
 /* 8039EB40 0039A7A0  4B ED 0E 09 */	bl func_8026F948
 /* 8039EB44 0039A7A4  80 7F 05 E4 */	lwz r3, 0x5e4(r31)
-/* 8039EB48 0039A7A8  4B FD BE A5 */	bl func_8037A9EC
+/* 8039EB48 0039A7A8  4B FD BE A5 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039EB4C 0039A7AC  80 7F 05 D0 */	lwz r3, 0x5d0(r31)
 /* 8039EB50 0039A7B0  38 A0 00 01 */	li r5, 1
 /* 8039EB54 0039A7B4  80 9F 05 E4 */	lwz r4, 0x5e4(r31)
@@ -35218,7 +35218,7 @@ lbl_8039ED5C:
 /* 8039ED84 0039A9E4  7F C3 F3 78 */	mr r3, r30
 /* 8039ED88 0039A9E8  4B ED 0B C1 */	bl func_8026F948
 /* 8039ED8C 0039A9EC  80 7F 05 E4 */	lwz r3, 0x5e4(r31)
-/* 8039ED90 0039A9F0  4B FD BC 5D */	bl func_8037A9EC
+/* 8039ED90 0039A9F0  4B FD BC 5D */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039ED94 0039A9F4  80 7F 05 D0 */	lwz r3, 0x5d0(r31)
 /* 8039ED98 0039A9F8  38 A0 00 0C */	li r5, 0xc
 /* 8039ED9C 0039A9FC  80 9F 05 E4 */	lwz r4, 0x5e4(r31)
@@ -35276,7 +35276,7 @@ lbl_8039EE34:
 /* 8039EE5C 0039AABC  7F C3 F3 78 */	mr r3, r30
 /* 8039EE60 0039AAC0  4B ED 0A E9 */	bl func_8026F948
 /* 8039EE64 0039AAC4  80 7F 05 E4 */	lwz r3, 0x5e4(r31)
-/* 8039EE68 0039AAC8  4B FD BB 85 */	bl func_8037A9EC
+/* 8039EE68 0039AAC8  4B FD BB 85 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039EE6C 0039AACC  80 7F 05 D0 */	lwz r3, 0x5d0(r31)
 /* 8039EE70 0039AAD0  38 A0 00 0A */	li r5, 0xa
 /* 8039EE74 0039AAD4  80 9F 05 E4 */	lwz r4, 0x5e4(r31)
@@ -35334,7 +35334,7 @@ lbl_8039EF0C:
 /* 8039EF34 0039AB94  7F C3 F3 78 */	mr r3, r30
 /* 8039EF38 0039AB98  4B ED 0A 11 */	bl func_8026F948
 /* 8039EF3C 0039AB9C  80 7F 05 E4 */	lwz r3, 0x5e4(r31)
-/* 8039EF40 0039ABA0  4B FD BA AD */	bl func_8037A9EC
+/* 8039EF40 0039ABA0  4B FD BA AD */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039EF44 0039ABA4  80 7F 05 D0 */	lwz r3, 0x5d0(r31)
 /* 8039EF48 0039ABA8  38 A0 00 0D */	li r5, 0xd
 /* 8039EF4C 0039ABAC  80 9F 05 E4 */	lwz r4, 0x5e4(r31)
@@ -35490,7 +35490,7 @@ lbl_8039F140:
 /* 8039F168 0039ADC8  7F C3 F3 78 */	mr r3, r30
 /* 8039F16C 0039ADCC  4B ED 07 DD */	bl func_8026F948
 /* 8039F170 0039ADD0  80 7F 05 E4 */	lwz r3, 0x5e4(r31)
-/* 8039F174 0039ADD4  4B FD B8 79 */	bl func_8037A9EC
+/* 8039F174 0039ADD4  4B FD B8 79 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039F178 0039ADD8  80 7F 05 D0 */	lwz r3, 0x5d0(r31)
 /* 8039F17C 0039ADDC  38 A0 00 0B */	li r5, 0xb
 /* 8039F180 0039ADE0  80 9F 05 E4 */	lwz r4, 0x5e4(r31)
@@ -35548,7 +35548,7 @@ lbl_8039F218:
 /* 8039F240 0039AEA0  7F C3 F3 78 */	mr r3, r30
 /* 8039F244 0039AEA4  4B ED 07 05 */	bl func_8026F948
 /* 8039F248 0039AEA8  80 7F 05 E4 */	lwz r3, 0x5e4(r31)
-/* 8039F24C 0039AEAC  4B FD B7 A1 */	bl func_8037A9EC
+/* 8039F24C 0039AEAC  4B FD B7 A1 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039F250 0039AEB0  80 7F 05 D0 */	lwz r3, 0x5d0(r31)
 /* 8039F254 0039AEB4  38 A0 00 09 */	li r5, 9
 /* 8039F258 0039AEB8  80 9F 05 E4 */	lwz r4, 0x5e4(r31)
@@ -35606,7 +35606,7 @@ lbl_8039F2F0:
 /* 8039F318 0039AF78  7F C3 F3 78 */	mr r3, r30
 /* 8039F31C 0039AF7C  4B ED 06 2D */	bl func_8026F948
 /* 8039F320 0039AF80  80 7F 05 E4 */	lwz r3, 0x5e4(r31)
-/* 8039F324 0039AF84  4B FD B6 C9 */	bl func_8037A9EC
+/* 8039F324 0039AF84  4B FD B6 C9 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039F328 0039AF88  80 7F 05 D0 */	lwz r3, 0x5d0(r31)
 /* 8039F32C 0039AF8C  38 A0 00 0D */	li r5, 0xd
 /* 8039F330 0039AF90  80 9F 05 E4 */	lwz r4, 0x5e4(r31)
@@ -35939,7 +35939,7 @@ lbl_8039F7A8:
 /* 8039F7D0 0039B430  7F A3 EB 78 */	mr r3, r29
 /* 8039F7D4 0039B434  4B ED 01 75 */	bl func_8026F948
 /* 8039F7D8 0039B438  80 7B 05 E4 */	lwz r3, 0x5e4(r27)
-/* 8039F7DC 0039B43C  4B FD B2 11 */	bl func_8037A9EC
+/* 8039F7DC 0039B43C  4B FD B2 11 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039F7E0 0039B440  80 7B 05 D0 */	lwz r3, 0x5d0(r27)
 /* 8039F7E4 0039B444  38 A0 00 04 */	li r5, 4
 /* 8039F7E8 0039B448  80 9B 05 E4 */	lwz r4, 0x5e4(r27)
@@ -36020,7 +36020,7 @@ lbl_8039F8D4:
 /* 8039F8FC 0039B55C  7F A3 EB 78 */	mr r3, r29
 /* 8039F900 0039B560  4B ED 00 49 */	bl func_8026F948
 /* 8039F904 0039B564  80 7B 05 E4 */	lwz r3, 0x5e4(r27)
-/* 8039F908 0039B568  4B FD B0 E5 */	bl func_8037A9EC
+/* 8039F908 0039B568  4B FD B0 E5 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039F90C 0039B56C  80 7B 05 D0 */	lwz r3, 0x5d0(r27)
 /* 8039F910 0039B570  38 A0 00 04 */	li r5, 4
 /* 8039F914 0039B574  80 9B 05 E4 */	lwz r4, 0x5e4(r27)
@@ -36251,7 +36251,7 @@ lbl_8039FC08:
 /* 8039FC30 0039B890  7F A3 EB 78 */	mr r3, r29
 /* 8039FC34 0039B894  4B EC FD 15 */	bl func_8026F948
 /* 8039FC38 0039B898  80 7B 05 E4 */	lwz r3, 0x5e4(r27)
-/* 8039FC3C 0039B89C  4B FD AD B1 */	bl func_8037A9EC
+/* 8039FC3C 0039B89C  4B FD AD B1 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039FC40 0039B8A0  80 7B 05 D0 */	lwz r3, 0x5d0(r27)
 /* 8039FC44 0039B8A4  38 A0 00 04 */	li r5, 4
 /* 8039FC48 0039B8A8  80 9B 05 E4 */	lwz r4, 0x5e4(r27)
@@ -36482,7 +36482,7 @@ lbl_8039FF38:
 /* 8039FF60 0039BBC0  7F A3 EB 78 */	mr r3, r29
 /* 8039FF64 0039BBC4  4B EC F9 E5 */	bl func_8026F948
 /* 8039FF68 0039BBC8  80 7B 05 E4 */	lwz r3, 0x5e4(r27)
-/* 8039FF6C 0039BBCC  4B FD AA 81 */	bl func_8037A9EC
+/* 8039FF6C 0039BBCC  4B FD AA 81 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 8039FF70 0039BBD0  80 7B 05 D0 */	lwz r3, 0x5d0(r27)
 /* 8039FF74 0039BBD4  38 A0 00 04 */	li r5, 4
 /* 8039FF78 0039BBD8  80 9B 05 E4 */	lwz r4, 0x5e4(r27)
@@ -36565,7 +36565,7 @@ lbl_803A0064:
 /* 803A008C 0039BCEC  7F A3 EB 78 */	mr r3, r29
 /* 803A0090 0039BCF0  4B EC F8 B9 */	bl func_8026F948
 /* 803A0094 0039BCF4  80 7B 05 E4 */	lwz r3, 0x5e4(r27)
-/* 803A0098 0039BCF8  4B FD A9 55 */	bl func_8037A9EC
+/* 803A0098 0039BCF8  4B FD A9 55 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A009C 0039BCFC  80 7B 05 D0 */	lwz r3, 0x5d0(r27)
 /* 803A00A0 0039BD00  38 A0 00 04 */	li r5, 4
 /* 803A00A4 0039BD04  80 9B 05 E4 */	lwz r4, 0x5e4(r27)
@@ -36645,7 +36645,7 @@ lbl_803A0188:
 /* 803A01B0 0039BE10  7F A3 EB 78 */	mr r3, r29
 /* 803A01B4 0039BE14  4B EC F7 95 */	bl func_8026F948
 /* 803A01B8 0039BE18  80 7B 05 E4 */	lwz r3, 0x5e4(r27)
-/* 803A01BC 0039BE1C  4B FD A8 31 */	bl func_8037A9EC
+/* 803A01BC 0039BE1C  4B FD A8 31 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A01C0 0039BE20  80 7B 05 D0 */	lwz r3, 0x5d0(r27)
 /* 803A01C4 0039BE24  38 A0 00 04 */	li r5, 4
 /* 803A01C8 0039BE28  80 9B 05 E4 */	lwz r4, 0x5e4(r27)
@@ -36725,7 +36725,7 @@ lbl_803A02AC:
 /* 803A02D4 0039BF34  7F A3 EB 78 */	mr r3, r29
 /* 803A02D8 0039BF38  4B EC F6 71 */	bl func_8026F948
 /* 803A02DC 0039BF3C  80 7B 05 E4 */	lwz r3, 0x5e4(r27)
-/* 803A02E0 0039BF40  4B FD A7 0D */	bl func_8037A9EC
+/* 803A02E0 0039BF40  4B FD A7 0D */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A02E4 0039BF44  80 7B 05 D0 */	lwz r3, 0x5d0(r27)
 /* 803A02E8 0039BF48  38 A0 00 04 */	li r5, 4
 /* 803A02EC 0039BF4C  80 9B 05 E4 */	lwz r4, 0x5e4(r27)
@@ -36805,7 +36805,7 @@ lbl_803A03D0:
 /* 803A03F8 0039C058  7F A3 EB 78 */	mr r3, r29
 /* 803A03FC 0039C05C  4B EC F5 4D */	bl func_8026F948
 /* 803A0400 0039C060  80 7B 05 E4 */	lwz r3, 0x5e4(r27)
-/* 803A0404 0039C064  4B FD A5 E9 */	bl func_8037A9EC
+/* 803A0404 0039C064  4B FD A5 E9 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A0408 0039C068  80 7B 05 D0 */	lwz r3, 0x5d0(r27)
 /* 803A040C 0039C06C  38 A0 00 04 */	li r5, 4
 /* 803A0410 0039C070  80 9B 05 E4 */	lwz r4, 0x5e4(r27)
@@ -36885,7 +36885,7 @@ lbl_803A04F4:
 /* 803A051C 0039C17C  7F A3 EB 78 */	mr r3, r29
 /* 803A0520 0039C180  4B EC F4 29 */	bl func_8026F948
 /* 803A0524 0039C184  80 7B 05 E4 */	lwz r3, 0x5e4(r27)
-/* 803A0528 0039C188  4B FD A4 C5 */	bl func_8037A9EC
+/* 803A0528 0039C188  4B FD A4 C5 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A052C 0039C18C  80 7B 05 D0 */	lwz r3, 0x5d0(r27)
 /* 803A0530 0039C190  38 A0 00 04 */	li r5, 4
 /* 803A0534 0039C194  80 9B 05 E4 */	lwz r4, 0x5e4(r27)
@@ -36965,7 +36965,7 @@ lbl_803A0618:
 /* 803A0640 0039C2A0  7F A3 EB 78 */	mr r3, r29
 /* 803A0644 0039C2A4  4B EC F3 05 */	bl func_8026F948
 /* 803A0648 0039C2A8  80 7B 05 E4 */	lwz r3, 0x5e4(r27)
-/* 803A064C 0039C2AC  4B FD A3 A1 */	bl func_8037A9EC
+/* 803A064C 0039C2AC  4B FD A3 A1 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A0650 0039C2B0  80 7B 05 D0 */	lwz r3, 0x5d0(r27)
 /* 803A0654 0039C2B4  38 A0 00 04 */	li r5, 4
 /* 803A0658 0039C2B8  80 9B 05 E4 */	lwz r4, 0x5e4(r27)
@@ -37045,7 +37045,7 @@ lbl_803A073C:
 /* 803A0764 0039C3C4  7F A3 EB 78 */	mr r3, r29
 /* 803A0768 0039C3C8  4B EC F1 E1 */	bl func_8026F948
 /* 803A076C 0039C3CC  80 7B 05 E4 */	lwz r3, 0x5e4(r27)
-/* 803A0770 0039C3D0  4B FD A2 7D */	bl func_8037A9EC
+/* 803A0770 0039C3D0  4B FD A2 7D */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A0774 0039C3D4  80 7B 05 D0 */	lwz r3, 0x5d0(r27)
 /* 803A0778 0039C3D8  38 A0 00 04 */	li r5, 4
 /* 803A077C 0039C3DC  80 9B 05 E4 */	lwz r4, 0x5e4(r27)
@@ -37985,7 +37985,7 @@ lbl_803A1448:
 /* 803A1470 0039D0D0  7F C3 F3 78 */	mr r3, r30
 /* 803A1474 0039D0D4  4B EC E4 D5 */	bl func_8026F948
 /* 803A1478 0039D0D8  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A147C 0039D0DC  4B FD 95 71 */	bl func_8037A9EC
+/* 803A147C 0039D0DC  4B FD 95 71 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A1480 0039D0E0  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A1484 0039D0E4  38 A0 00 05 */	li r5, 5
 /* 803A1488 0039D0E8  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -38173,7 +38173,7 @@ lbl_803A16F8:
 /* 803A1720 0039D380  7F C3 F3 78 */	mr r3, r30
 /* 803A1724 0039D384  4B EC E2 25 */	bl func_8026F948
 /* 803A1728 0039D388  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A172C 0039D38C  4B FD 92 C1 */	bl func_8037A9EC
+/* 803A172C 0039D38C  4B FD 92 C1 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A1730 0039D390  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A1734 0039D394  38 A0 00 01 */	li r5, 1
 /* 803A1738 0039D398  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -38229,7 +38229,7 @@ lbl_803A17D4:
 /* 803A17FC 0039D45C  7F C3 F3 78 */	mr r3, r30
 /* 803A1800 0039D460  4B EC E1 49 */	bl func_8026F948
 /* 803A1804 0039D464  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A1808 0039D468  4B FD 91 E5 */	bl func_8037A9EC
+/* 803A1808 0039D468  4B FD 91 E5 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A180C 0039D46C  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A1810 0039D470  38 A0 00 08 */	li r5, 8
 /* 803A1814 0039D474  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -38303,7 +38303,7 @@ lbl_803A18F0:
 /* 803A1918 0039D578  7F C3 F3 78 */	mr r3, r30
 /* 803A191C 0039D57C  4B EC E0 2D */	bl func_8026F948
 /* 803A1920 0039D580  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A1924 0039D584  4B FD 90 C9 */	bl func_8037A9EC
+/* 803A1924 0039D584  4B FD 90 C9 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A1928 0039D588  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A192C 0039D58C  38 A0 00 05 */	li r5, 5
 /* 803A1930 0039D590  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -38417,7 +38417,7 @@ lbl_803A1A94:
 /* 803A1ABC 0039D71C  7F C3 F3 78 */	mr r3, r30
 /* 803A1AC0 0039D720  4B EC DE 89 */	bl func_8026F948
 /* 803A1AC4 0039D724  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A1AC8 0039D728  4B FD 8F 25 */	bl func_8037A9EC
+/* 803A1AC8 0039D728  4B FD 8F 25 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A1ACC 0039D72C  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A1AD0 0039D730  38 A0 00 0C */	li r5, 0xc
 /* 803A1AD4 0039D734  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -38475,7 +38475,7 @@ lbl_803A1B6C:
 /* 803A1B94 0039D7F4  7F C3 F3 78 */	mr r3, r30
 /* 803A1B98 0039D7F8  4B EC DD B1 */	bl func_8026F948
 /* 803A1B9C 0039D7FC  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A1BA0 0039D800  4B FD 8E 4D */	bl func_8037A9EC
+/* 803A1BA0 0039D800  4B FD 8E 4D */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A1BA4 0039D804  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A1BA8 0039D808  38 A0 00 0A */	li r5, 0xa
 /* 803A1BAC 0039D80C  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -38569,7 +38569,7 @@ lbl_803A1CC0:
 /* 803A1CE8 0039D948  7F C3 F3 78 */	mr r3, r30
 /* 803A1CEC 0039D94C  4B EC DC 5D */	bl func_8026F948
 /* 803A1CF0 0039D950  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A1CF4 0039D954  4B FD 8C F9 */	bl func_8037A9EC
+/* 803A1CF4 0039D954  4B FD 8C F9 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A1CF8 0039D958  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A1CFC 0039D95C  38 A0 00 0D */	li r5, 0xd
 /* 803A1D00 0039D960  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -38683,7 +38683,7 @@ lbl_803A1E64:
 /* 803A1E8C 0039DAEC  7F C3 F3 78 */	mr r3, r30
 /* 803A1E90 0039DAF0  4B EC DA B9 */	bl func_8026F948
 /* 803A1E94 0039DAF4  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A1E98 0039DAF8  4B FD 8B 55 */	bl func_8037A9EC
+/* 803A1E98 0039DAF8  4B FD 8B 55 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A1E9C 0039DAFC  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A1EA0 0039DB00  38 A0 00 0B */	li r5, 0xb
 /* 803A1EA4 0039DB04  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -38741,7 +38741,7 @@ lbl_803A1F3C:
 /* 803A1F64 0039DBC4  7F C3 F3 78 */	mr r3, r30
 /* 803A1F68 0039DBC8  4B EC D9 E1 */	bl func_8026F948
 /* 803A1F6C 0039DBCC  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A1F70 0039DBD0  4B FD 8A 7D */	bl func_8037A9EC
+/* 803A1F70 0039DBD0  4B FD 8A 7D */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A1F74 0039DBD4  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A1F78 0039DBD8  38 A0 00 09 */	li r5, 9
 /* 803A1F7C 0039DBDC  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -38835,7 +38835,7 @@ lbl_803A2090:
 /* 803A20B8 0039DD18  7F C3 F3 78 */	mr r3, r30
 /* 803A20BC 0039DD1C  4B EC D8 8D */	bl func_8026F948
 /* 803A20C0 0039DD20  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A20C4 0039DD24  4B FD 89 29 */	bl func_8037A9EC
+/* 803A20C4 0039DD24  4B FD 89 29 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A20C8 0039DD28  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A20CC 0039DD2C  38 A0 00 0D */	li r5, 0xd
 /* 803A20D0 0039DD30  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -38948,7 +38948,7 @@ lbl_803A2230:
 /* 803A2258 0039DEB8  7F C3 F3 78 */	mr r3, r30
 /* 803A225C 0039DEBC  4B EC D6 ED */	bl func_8026F948
 /* 803A2260 0039DEC0  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A2264 0039DEC4  4B FD 87 89 */	bl func_8037A9EC
+/* 803A2264 0039DEC4  4B FD 87 89 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A2268 0039DEC8  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A226C 0039DECC  38 A0 00 0E */	li r5, 0xe
 /* 803A2270 0039DED0  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -39020,7 +39020,7 @@ lbl_803A2338:
 /* 803A2360 0039DFC0  7F C3 F3 78 */	mr r3, r30
 /* 803A2364 0039DFC4  4B EC D5 E5 */	bl func_8026F948
 /* 803A2368 0039DFC8  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A236C 0039DFCC  4B FD 86 81 */	bl func_8037A9EC
+/* 803A236C 0039DFCC  4B FD 86 81 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A2370 0039DFD0  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A2374 0039DFD4  38 A0 00 0D */	li r5, 0xd
 /* 803A2378 0039DFD8  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -39148,7 +39148,7 @@ lbl_803A250C:
 /* 803A2534 0039E194  7F C3 F3 78 */	mr r3, r30
 /* 803A2538 0039E198  4B EC D4 11 */	bl func_8026F948
 /* 803A253C 0039E19C  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A2540 0039E1A0  4B FD 84 AD */	bl func_8037A9EC
+/* 803A2540 0039E1A0  4B FD 84 AD */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A2544 0039E1A4  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A2548 0039E1A8  38 A0 00 0F */	li r5, 0xf
 /* 803A254C 0039E1AC  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -39184,7 +39184,7 @@ lbl_803A2594:
 /* 803A25BC 0039E21C  7F C3 F3 78 */	mr r3, r30
 /* 803A25C0 0039E220  4B EC D3 89 */	bl func_8026F948
 /* 803A25C4 0039E224  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A25C8 0039E228  4B FD 84 25 */	bl func_8037A9EC
+/* 803A25C8 0039E228  4B FD 84 25 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A25CC 0039E22C  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A25D0 0039E230  38 A0 00 0D */	li r5, 0xd
 /* 803A25D4 0039E234  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -39312,7 +39312,7 @@ lbl_803A2778:
 /* 803A27A0 0039E400  7F C3 F3 78 */	mr r3, r30
 /* 803A27A4 0039E404  4B EC D1 A5 */	bl func_8026F948
 /* 803A27A8 0039E408  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A27AC 0039E40C  4B FD 82 41 */	bl func_8037A9EC
+/* 803A27AC 0039E40C  4B FD 82 41 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A27B0 0039E410  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A27B4 0039E414  38 A0 00 05 */	li r5, 5
 /* 803A27B8 0039E418  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -39347,7 +39347,7 @@ lbl_803A27FC:
 /* 803A2824 0039E484  7F C3 F3 78 */	mr r3, r30
 /* 803A2828 0039E488  4B EC D1 21 */	bl func_8026F948
 /* 803A282C 0039E48C  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A2830 0039E490  4B FD 81 BD */	bl func_8037A9EC
+/* 803A2830 0039E490  4B FD 81 BD */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A2834 0039E494  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A2838 0039E498  38 A0 00 10 */	li r5, 0x10
 /* 803A283C 0039E49C  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -39425,7 +39425,7 @@ lbl_803A2920:
 /* 803A2948 0039E5A8  7F C3 F3 78 */	mr r3, r30
 /* 803A294C 0039E5AC  4B EC CF FD */	bl func_8026F948
 /* 803A2950 0039E5B0  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A2954 0039E5B4  4B FD 80 99 */	bl func_8037A9EC
+/* 803A2954 0039E5B4  4B FD 80 99 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A2958 0039E5B8  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A295C 0039E5BC  38 A0 00 02 */	li r5, 2
 /* 803A2960 0039E5C0  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -39463,7 +39463,7 @@ lbl_803A29B0:
 /* 803A29D8 0039E638  7F C3 F3 78 */	mr r3, r30
 /* 803A29DC 0039E63C  4B EC CF 6D */	bl func_8026F948
 /* 803A29E0 0039E640  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A29E4 0039E644  4B FD 80 09 */	bl func_8037A9EC
+/* 803A29E4 0039E644  4B FD 80 09 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A29E8 0039E648  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A29EC 0039E64C  38 A0 00 03 */	li r5, 3
 /* 803A29F0 0039E650  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -39540,7 +39540,7 @@ lbl_803A2AD0:
 /* 803A2AF8 0039E758  7F C3 F3 78 */	mr r3, r30
 /* 803A2AFC 0039E75C  4B EC CE 4D */	bl func_8026F948
 /* 803A2B00 0039E760  80 7D 05 E4 */	lwz r3, 0x5e4(r29)
-/* 803A2B04 0039E764  4B FD 7E E9 */	bl func_8037A9EC
+/* 803A2B04 0039E764  4B FD 7E E9 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 803A2B08 0039E768  80 7D 05 D0 */	lwz r3, 0x5d0(r29)
 /* 803A2B0C 0039E76C  38 A0 00 06 */	li r5, 6
 /* 803A2B10 0039E770  80 9D 05 E4 */	lwz r4, 0x5e4(r29)
@@ -40351,7 +40351,7 @@ lbl_803A366C:
 /* 803A3670 0039F2D0  2C 03 00 00 */	cmpwi r3, 0
 /* 803A3674 0039F2D4  41 82 00 0C */	beq lbl_803A3680
 /* 803A3678 0039F2D8  41 82 00 08 */	beq lbl_803A3680
-/* 803A367C 0039F2DC  4B FD 73 71 */	bl func_8037A9EC
+/* 803A367C 0039F2DC  4B FD 73 71 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 lbl_803A3680:
 /* 803A3680 0039F2E0  7F E3 FB 78 */	mr r3, r31
 /* 803A3684 0039F2E4  4B EC C3 A1 */	bl func_8026FA24
@@ -42225,7 +42225,7 @@ func_803A50E8:
 /* 803A5138 003A0D98  4B EC 49 41 */	bl OSCancelAlarm
 /* 803A513C 003A0D9C  34 7E 00 20 */	addic. r3, r30, 0x20
 /* 803A5140 003A0DA0  41 82 00 08 */	beq lbl_803A5148
-/* 803A5144 003A0DA4  4B FD 58 A9 */	bl func_8037A9EC
+/* 803A5144 003A0DA4  4B FD 58 A9 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 lbl_803A5148:
 /* 803A5148 003A0DA8  2C 1F 00 00 */	cmpwi r31, 0
 /* 803A514C 003A0DAC  40 81 00 0C */	ble lbl_803A5158
diff --git a/asm/text_7.s b/asm/text_7.s
index 6e3114f..9c22019 100644
--- a/asm/text_7.s
+++ b/asm/text_7.s
@@ -58069,7 +58069,7 @@ lbl_80255004:
 /* 8025503C 00250C9C  4E 80 04 21 */	bctrl
 lbl_80255040:
 /* 80255040 00250CA0  7F A3 EB 78 */	mr r3, r29
-/* 80255044 00250CA4  48 12 59 A9 */	bl func_8037A9EC
+/* 80255044 00250CA4  48 12 59 A9 */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 lbl_80255048:
 /* 80255048 00250CA8  2C 1C 00 00 */	cmpwi r28, 0
 /* 8025504C 00250CAC  41 82 00 24 */	beq lbl_80255070
@@ -60306,7 +60306,7 @@ lbl_80256E8C:
 /* 80256EA4 00252B04  93 C1 00 08 */	stw r30, 8(r1)
 /* 80256EA8 00252B08  7C 7E 1B 78 */	mr r30, r3
 /* 80256EAC 00252B0C  41 82 00 18 */	beq lbl_80256EC4
-/* 80256EB0 00252B10  48 12 3B 3D */	bl func_8037A9EC
+/* 80256EB0 00252B10  48 12 3B 3D */	bl DetachSound__Q34nw4r3snd11SoundHandleFv
 /* 80256EB4 00252B14  2C 1F 00 00 */	cmpwi r31, 0
 /* 80256EB8 00252B18  40 81 00 0C */	ble lbl_80256EC4
 /* 80256EBC 00252B1C  7F C3 F3 78 */	mr r3, r30
diff --git a/obj_files.mk b/obj_files.mk
index 3463405..1e32076 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -143,6 +143,7 @@ TEXT_O_FILES := 						                          \
 	$(BUILD_DIR)/asm/nw4r/snd/detail/snd_SoundArchiveFile.o           \
 	$(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/text_10_6.o                                      \
 	$(BUILD_DIR)/asm/text_11.o