work on Z2SoundMgr and Z2SeMgr (#2055)

14 files changed, 0 insertions, 664 deletions

diff --git a/asm/Z2AudioLib/Z2SeMgr/initSe__7Z2SeMgrFv.s b/asm/Z2AudioLib/Z2SeMgr/initSe__7Z2SeMgrFv.s
deleted file mode 100644
index 2463430b10..0000000000
--- a/asm/Z2AudioLib/Z2SeMgr/initSe__7Z2SeMgrFv.s
+++ /dev/null
@@ -1,52 +0,0 @@
-lbl_802AB750:
-/* 802AB750  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 802AB754  7C 08 02 A6 */	mflr r0
-/* 802AB758  90 01 00 24 */	stw r0, 0x24(r1)
-/* 802AB75C  39 61 00 20 */	addi r11, r1, 0x20
-/* 802AB760  48 0B 6A 75 */	bl _savegpr_27
-/* 802AB764  7C 7B 1B 78 */	mr r27, r3
-/* 802AB768  3B 80 00 00 */	li r28, 0
-/* 802AB76C  3B E0 FF FF */	li r31, -1
-/* 802AB770  3B C0 00 00 */	li r30, 0
-/* 802AB774  48 00 00 24 */	b lbl_802AB798
-lbl_802AB778:
-/* 802AB778  57 80 06 3E */	clrlwi r0, r28, 0x18
-/* 802AB77C  1C 00 00 24 */	mulli r0, r0, 0x24
-/* 802AB780  7F BB 02 14 */	add r29, r27, r0
-/* 802AB784  38 7D 00 68 */	addi r3, r29, 0x68
-/* 802AB788  48 00 35 35 */	bl resetMultiSePos__12Z2MultiSeMgrFv
-/* 802AB78C  93 FD 00 84 */	stw r31, 0x84(r29)
-/* 802AB790  9B DD 00 88 */	stb r30, 0x88(r29)
-/* 802AB794  3B 9C 00 01 */	addi r28, r28, 1
-lbl_802AB798:
-/* 802AB798  57 80 06 3E */	clrlwi r0, r28, 0x18
-/* 802AB79C  28 00 00 0A */	cmplwi r0, 0xa
-/* 802AB7A0  41 80 FF D8 */	blt lbl_802AB778
-/* 802AB7A4  3B C0 00 00 */	li r30, 0
-/* 802AB7A8  9B DB 01 D0 */	stb r30, 0x1d0(r27)
-/* 802AB7AC  3B 80 00 00 */	li r28, 0
-/* 802AB7B0  3B E0 FF FF */	li r31, -1
-/* 802AB7B4  48 00 00 24 */	b lbl_802AB7D8
-lbl_802AB7B8:
-/* 802AB7B8  57 80 06 3E */	clrlwi r0, r28, 0x18
-/* 802AB7BC  1C 00 00 24 */	mulli r0, r0, 0x24
-/* 802AB7C0  7F BB 02 14 */	add r29, r27, r0
-/* 802AB7C4  38 7D 01 D4 */	addi r3, r29, 0x1d4
-/* 802AB7C8  48 00 34 F5 */	bl resetMultiSePos__12Z2MultiSeMgrFv
-/* 802AB7CC  93 FD 01 F0 */	stw r31, 0x1f0(r29)
-/* 802AB7D0  9B DD 01 F4 */	stb r30, 0x1f4(r29)
-/* 802AB7D4  3B 9C 00 01 */	addi r28, r28, 1
-lbl_802AB7D8:
-/* 802AB7D8  57 80 06 3E */	clrlwi r0, r28, 0x18
-/* 802AB7DC  28 00 00 0A */	cmplwi r0, 0xa
-/* 802AB7E0  41 80 FF D8 */	blt lbl_802AB7B8
-/* 802AB7E4  38 00 00 00 */	li r0, 0
-/* 802AB7E8  98 1B 03 3C */	stb r0, 0x33c(r27)
-/* 802AB7EC  7F 63 DB 78 */	mr r3, r27
-/* 802AB7F0  48 00 00 1D */	bl resetModY__7Z2SeMgrFv
-/* 802AB7F4  39 61 00 20 */	addi r11, r1, 0x20
-/* 802AB7F8  48 0B 6A 29 */	bl _restgpr_27
-/* 802AB7FC  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 802AB800  7C 08 03 A6 */	mtlr r0
-/* 802AB804  38 21 00 20 */	addi r1, r1, 0x20
-/* 802AB808  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SeMgr/isLevelSe__7Z2SeMgrF10JAISoundID.s b/asm/Z2AudioLib/Z2SeMgr/isLevelSe__7Z2SeMgrF10JAISoundID.s
deleted file mode 100644
index 82220954b0..0000000000
--- a/asm/Z2AudioLib/Z2SeMgr/isLevelSe__7Z2SeMgrF10JAISoundID.s
+++ /dev/null
@@ -1,40 +0,0 @@
-lbl_802AE524:
-/* 802AE524  80 84 00 00 */	lwz r4, 0(r4)
-/* 802AE528  3C 60 00 08 */	lis r3, 0x0008 /* 0x00080018@ha */
-/* 802AE52C  38 03 00 18 */	addi r0, r3, 0x0018 /* 0x00080018@l */
-/* 802AE530  7C 04 00 00 */	cmpw r4, r0
-/* 802AE534  41 82 00 6C */	beq lbl_802AE5A0
-/* 802AE538  40 80 00 38 */	bge lbl_802AE570
-/* 802AE53C  3C 60 00 02 */	lis r3, 0x0002 /* 0x00020039@ha */
-/* 802AE540  38 03 00 39 */	addi r0, r3, 0x0039 /* 0x00020039@l */
-/* 802AE544  7C 04 00 00 */	cmpw r4, r0
-/* 802AE548  41 82 00 60 */	beq lbl_802AE5A8
-/* 802AE54C  40 80 00 14 */	bge lbl_802AE560
-/* 802AE550  38 03 00 38 */	addi r0, r3, 0x38
-/* 802AE554  7C 04 00 00 */	cmpw r4, r0
-/* 802AE558  40 80 00 48 */	bge lbl_802AE5A0
-/* 802AE55C  48 00 00 4C */	b lbl_802AE5A8
-lbl_802AE560:
-/* 802AE560  38 03 00 3B */	addi r0, r3, 0x3b
-/* 802AE564  7C 04 00 00 */	cmpw r4, r0
-/* 802AE568  40 80 00 40 */	bge lbl_802AE5A8
-/* 802AE56C  48 00 00 34 */	b lbl_802AE5A0
-lbl_802AE570:
-/* 802AE570  3C 60 00 09 */	lis r3, 0x0009 /* 0x00090010@ha */
-/* 802AE574  38 03 00 10 */	addi r0, r3, 0x0010 /* 0x00090010@l */
-/* 802AE578  7C 04 00 00 */	cmpw r4, r0
-/* 802AE57C  41 82 00 24 */	beq lbl_802AE5A0
-/* 802AE580  40 80 00 28 */	bge lbl_802AE5A8
-/* 802AE584  38 03 00 07 */	addi r0, r3, 7
-/* 802AE588  7C 04 00 00 */	cmpw r4, r0
-/* 802AE58C  40 80 00 1C */	bge lbl_802AE5A8
-/* 802AE590  38 03 00 03 */	addi r0, r3, 3
-/* 802AE594  7C 04 00 00 */	cmpw r4, r0
-/* 802AE598  40 80 00 08 */	bge lbl_802AE5A0
-/* 802AE59C  48 00 00 0C */	b lbl_802AE5A8
-lbl_802AE5A0:
-/* 802AE5A0  38 60 00 01 */	li r3, 1
-/* 802AE5A4  4E 80 00 20 */	blr 
-lbl_802AE5A8:
-/* 802AE5A8  38 60 00 00 */	li r3, 0
-/* 802AE5AC  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SeMgr/messageSePlay__7Z2SeMgrFUsP3VecSc.s b/asm/Z2AudioLib/Z2SeMgr/messageSePlay__7Z2SeMgrFUsP3VecSc.s
deleted file mode 100644
index 3d3e326570..0000000000
--- a/asm/Z2AudioLib/Z2SeMgr/messageSePlay__7Z2SeMgrFUsP3VecSc.s
+++ /dev/null
@@ -1,16 +0,0 @@
-lbl_802ADB14:
-/* 802ADB14  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802ADB18  7C 08 02 A6 */	mflr r0
-/* 802ADB1C  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802ADB20  7C 88 23 78 */	mr r8, r4
-/* 802ADB24  7C A0 2B 78 */	mr r0, r5
-/* 802ADB28  7C C7 33 78 */	mr r7, r6
-/* 802ADB2C  80 6D 85 F0 */	lwz r3, __OSReport_disable-0x28(r13)
-/* 802ADB30  38 80 00 00 */	li r4, 0
-/* 802ADB34  7D 05 43 78 */	mr r5, r8
-/* 802ADB38  7C 06 03 78 */	mr r6, r0
-/* 802ADB3C  48 01 EE DD */	bl playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc
-/* 802ADB40  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802ADB44  7C 08 03 A6 */	mtlr r0
-/* 802ADB48  38 21 00 10 */	addi r1, r1, 0x10
-/* 802ADB4C  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SeMgr/modHeightAtCamera__7Z2SeMgrFPPC3Vec.s b/asm/Z2AudioLib/Z2SeMgr/modHeightAtCamera__7Z2SeMgrFPPC3Vec.s
deleted file mode 100644
index 7cb09fa77c..0000000000
--- a/asm/Z2AudioLib/Z2SeMgr/modHeightAtCamera__7Z2SeMgrFPPC3Vec.s
+++ /dev/null
@@ -1,77 +0,0 @@
-lbl_802AB830:
-/* 802AB830  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 802AB834  80 C4 00 00 */	lwz r6, 0(r4)
-/* 802AB838  28 06 00 00 */	cmplwi r6, 0
-/* 802AB83C  41 82 00 F8 */	beq lbl_802AB934
-/* 802AB840  38 E0 27 0F */	li r7, 0x270f
-/* 802AB844  39 00 00 00 */	li r8, 0
-/* 802AB848  38 A0 00 00 */	li r5, 0
-/* 802AB84C  38 00 00 08 */	li r0, 8
-/* 802AB850  7C 09 03 A6 */	mtctr r0
-lbl_802AB854:
-/* 802AB854  38 05 03 A0 */	addi r0, r5, 0x3a0
-/* 802AB858  7C 03 00 2E */	lwzx r0, r3, r0
-/* 802AB85C  7C 00 30 40 */	cmplw r0, r6
-/* 802AB860  40 82 00 0C */	bne lbl_802AB86C
-/* 802AB864  7D 07 43 78 */	mr r7, r8
-/* 802AB868  48 00 00 10 */	b lbl_802AB878
-lbl_802AB86C:
-/* 802AB86C  39 08 00 01 */	addi r8, r8, 1
-/* 802AB870  38 A5 00 04 */	addi r5, r5, 4
-/* 802AB874  42 00 FF E0 */	bdnz lbl_802AB854
-lbl_802AB878:
-/* 802AB878  2C 07 27 0F */	cmpwi r7, 0x270f
-/* 802AB87C  40 82 00 48 */	bne lbl_802AB8C4
-/* 802AB880  39 00 00 00 */	li r8, 0
-/* 802AB884  38 A0 00 00 */	li r5, 0
-/* 802AB888  38 00 00 08 */	li r0, 8
-/* 802AB88C  7C 09 03 A6 */	mtctr r0
-lbl_802AB890:
-/* 802AB890  38 05 03 A0 */	addi r0, r5, 0x3a0
-/* 802AB894  7C 03 00 2E */	lwzx r0, r3, r0
-/* 802AB898  28 00 00 00 */	cmplwi r0, 0
-/* 802AB89C  40 82 00 14 */	bne lbl_802AB8B0
-/* 802AB8A0  7D 07 43 78 */	mr r7, r8
-/* 802AB8A4  7C A3 2A 14 */	add r5, r3, r5
-/* 802AB8A8  90 C5 03 A0 */	stw r6, 0x3a0(r5)
-/* 802AB8AC  48 00 00 10 */	b lbl_802AB8BC
-lbl_802AB8B0:
-/* 802AB8B0  39 08 00 01 */	addi r8, r8, 1
-/* 802AB8B4  38 A5 00 04 */	addi r5, r5, 4
-/* 802AB8B8  42 00 FF D8 */	bdnz lbl_802AB890
-lbl_802AB8BC:
-/* 802AB8BC  2C 08 00 08 */	cmpwi r8, 8
-/* 802AB8C0  41 82 00 74 */	beq lbl_802AB934
-lbl_802AB8C4:
-/* 802AB8C4  80 A4 00 00 */	lwz r5, 0(r4)
-/* 802AB8C8  C0 05 00 00 */	lfs f0, 0(r5)
-/* 802AB8CC  1C E7 00 0C */	mulli r7, r7, 0xc
-/* 802AB8D0  7C C3 3A 14 */	add r6, r3, r7
-/* 802AB8D4  D0 06 03 40 */	stfs f0, 0x340(r6)
-/* 802AB8D8  C0 05 00 04 */	lfs f0, 4(r5)
-/* 802AB8DC  D0 06 03 44 */	stfs f0, 0x344(r6)
-/* 802AB8E0  C0 05 00 08 */	lfs f0, 8(r5)
-/* 802AB8E4  D0 06 03 48 */	stfs f0, 0x348(r6)
-/* 802AB8E8  80 AD 85 C4 */	lwz r5, __OSReport_disable-0x54(r13)
-/* 802AB8EC  E0 25 01 70 */	psq_l f1, 368(r5), 0, 0 /* qr0 */
-/* 802AB8F0  C0 05 01 78 */	lfs f0, 0x178(r5)
-/* 802AB8F4  F0 21 00 08 */	psq_st f1, 8(r1), 0, 0 /* qr0 */
-/* 802AB8F8  D0 01 00 10 */	stfs f0, 0x10(r1)
-/* 802AB8FC  80 A1 00 08 */	lwz r5, 8(r1)
-/* 802AB900  80 01 00 0C */	lwz r0, 0xc(r1)
-/* 802AB904  90 A1 00 14 */	stw r5, 0x14(r1)
-/* 802AB908  90 01 00 18 */	stw r0, 0x18(r1)
-/* 802AB90C  80 01 00 10 */	lwz r0, 0x10(r1)
-/* 802AB910  90 01 00 1C */	stw r0, 0x1c(r1)
-/* 802AB914  C0 06 03 44 */	lfs f0, 0x344(r6)
-/* 802AB918  C0 21 00 18 */	lfs f1, 0x18(r1)
-/* 802AB91C  FC 00 08 40 */	fcmpo cr0, f0, f1
-/* 802AB920  40 81 00 08 */	ble lbl_802AB928
-/* 802AB924  D0 26 03 44 */	stfs f1, 0x344(r6)
-lbl_802AB928:
-/* 802AB928  38 07 03 40 */	addi r0, r7, 0x340
-/* 802AB92C  7C 03 02 14 */	add r0, r3, r0
-/* 802AB930  90 04 00 00 */	stw r0, 0(r4)
-lbl_802AB934:
-/* 802AB934  38 21 00 20 */	addi r1, r1, 0x20
-/* 802AB938  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SeMgr/seStopAll__7Z2SeMgrFUl.s b/asm/Z2AudioLib/Z2SeMgr/seStopAll__7Z2SeMgrFUl.s
deleted file mode 100644
index 53a92140fd..0000000000
--- a/asm/Z2AudioLib/Z2SeMgr/seStopAll__7Z2SeMgrFUl.s
+++ /dev/null
@@ -1,43 +0,0 @@
-lbl_802AD94C:
-/* 802AD94C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802AD950  7C 08 02 A6 */	mflr r0
-/* 802AD954  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802AD958  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802AD95C  93 C1 00 08 */	stw r30, 8(r1)
-/* 802AD960  7C 9E 23 78 */	mr r30, r4
-/* 802AD964  83 ED 85 E0 */	lwz r31, __OSReport_disable-0x38(r13)
-/* 802AD968  38 7F 00 18 */	addi r3, r31, 0x18
-/* 802AD96C  4B FF 24 75 */	bl stop__16JAISeCategoryMgrFUl
-/* 802AD970  38 7F 00 84 */	addi r3, r31, 0x84
-/* 802AD974  7F C4 F3 78 */	mr r4, r30
-/* 802AD978  4B FF 24 69 */	bl stop__16JAISeCategoryMgrFUl
-/* 802AD97C  38 7F 00 F0 */	addi r3, r31, 0xf0
-/* 802AD980  7F C4 F3 78 */	mr r4, r30
-/* 802AD984  4B FF 24 5D */	bl stop__16JAISeCategoryMgrFUl
-/* 802AD988  38 7F 01 5C */	addi r3, r31, 0x15c
-/* 802AD98C  7F C4 F3 78 */	mr r4, r30
-/* 802AD990  4B FF 24 51 */	bl stop__16JAISeCategoryMgrFUl
-/* 802AD994  38 7F 01 C8 */	addi r3, r31, 0x1c8
-/* 802AD998  7F C4 F3 78 */	mr r4, r30
-/* 802AD99C  4B FF 24 45 */	bl stop__16JAISeCategoryMgrFUl
-/* 802AD9A0  38 7F 02 34 */	addi r3, r31, 0x234
-/* 802AD9A4  7F C4 F3 78 */	mr r4, r30
-/* 802AD9A8  4B FF 24 39 */	bl stop__16JAISeCategoryMgrFUl
-/* 802AD9AC  38 7F 02 A0 */	addi r3, r31, 0x2a0
-/* 802AD9B0  7F C4 F3 78 */	mr r4, r30
-/* 802AD9B4  4B FF 24 2D */	bl stop__16JAISeCategoryMgrFUl
-/* 802AD9B8  38 7F 03 0C */	addi r3, r31, 0x30c
-/* 802AD9BC  7F C4 F3 78 */	mr r4, r30
-/* 802AD9C0  4B FF 24 21 */	bl stop__16JAISeCategoryMgrFUl
-/* 802AD9C4  38 7F 03 78 */	addi r3, r31, 0x378
-/* 802AD9C8  7F C4 F3 78 */	mr r4, r30
-/* 802AD9CC  4B FF 24 15 */	bl stop__16JAISeCategoryMgrFUl
-/* 802AD9D0  38 7F 03 E4 */	addi r3, r31, 0x3e4
-/* 802AD9D4  7F C4 F3 78 */	mr r4, r30
-/* 802AD9D8  4B FF 24 09 */	bl stop__16JAISeCategoryMgrFUl
-/* 802AD9DC  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802AD9E0  83 C1 00 08 */	lwz r30, 8(r1)
-/* 802AD9E4  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802AD9E8  7C 08 03 A6 */	mtlr r0
-/* 802AD9EC  38 21 00 10 */	addi r1, r1, 0x10
-/* 802AD9F0  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SeMgr/seStop__7Z2SeMgrF10JAISoundIDUl.s b/asm/Z2AudioLib/Z2SeMgr/seStop__7Z2SeMgrF10JAISoundIDUl.s
deleted file mode 100644
index 21d82354a2..0000000000
--- a/asm/Z2AudioLib/Z2SeMgr/seStop__7Z2SeMgrF10JAISoundIDUl.s
+++ /dev/null
@@ -1,44 +0,0 @@
-lbl_802AD8B0:
-/* 802AD8B0  94 21 FF D0 */	stwu r1, -0x30(r1)
-/* 802AD8B4  7C 08 02 A6 */	mflr r0
-/* 802AD8B8  90 01 00 34 */	stw r0, 0x34(r1)
-/* 802AD8BC  39 61 00 30 */	addi r11, r1, 0x30
-/* 802AD8C0  48 0B 49 15 */	bl _savegpr_27
-/* 802AD8C4  7C 7B 1B 78 */	mr r27, r3
-/* 802AD8C8  7C 9C 23 78 */	mr r28, r4
-/* 802AD8CC  7C BD 2B 78 */	mr r29, r5
-/* 802AD8D0  80 64 00 00 */	lwz r3, 0(r4)
-/* 802AD8D4  3C 03 00 01 */	addis r0, r3, 1
-/* 802AD8D8  28 00 FF FF */	cmplwi r0, 0xffff
-/* 802AD8DC  41 82 00 58 */	beq lbl_802AD934
-/* 802AD8E0  3B C0 00 00 */	li r30, 0
-/* 802AD8E4  48 00 00 44 */	b lbl_802AD928
-lbl_802AD8E8:
-/* 802AD8E8  80 7B 00 60 */	lwz r3, 0x60(r27)
-/* 802AD8EC  57 DF 15 BA */	rlwinm r31, r30, 2, 0x16, 0x1d
-/* 802AD8F0  7C 63 F8 2E */	lwzx r3, r3, r31
-/* 802AD8F4  28 03 00 00 */	cmplwi r3, 0
-/* 802AD8F8  41 82 00 2C */	beq lbl_802AD924
-/* 802AD8FC  80 83 00 18 */	lwz r4, 0x18(r3)
-/* 802AD900  90 81 00 08 */	stw r4, 8(r1)
-/* 802AD904  80 1C 00 00 */	lwz r0, 0(r28)
-/* 802AD908  7C 04 00 40 */	cmplw r4, r0
-/* 802AD90C  40 82 00 18 */	bne lbl_802AD924
-/* 802AD910  7F A4 EB 78 */	mr r4, r29
-/* 802AD914  4B FF 4B C9 */	bl stop__8JAISoundFUl
-/* 802AD918  80 1B 00 60 */	lwz r0, 0x60(r27)
-/* 802AD91C  7C 60 FA 14 */	add r3, r0, r31
-/* 802AD920  4B FF 48 65 */	bl releaseSound__14JAISoundHandleFv
-lbl_802AD924:
-/* 802AD924  3B DE 00 01 */	addi r30, r30, 1
-lbl_802AD928:
-/* 802AD928  57 C0 06 3E */	clrlwi r0, r30, 0x18
-/* 802AD92C  28 00 00 18 */	cmplwi r0, 0x18
-/* 802AD930  41 80 FF B8 */	blt lbl_802AD8E8
-lbl_802AD934:
-/* 802AD934  39 61 00 30 */	addi r11, r1, 0x30
-/* 802AD938  48 0B 48 E9 */	bl _restgpr_27
-/* 802AD93C  80 01 00 34 */	lwz r0, 0x34(r1)
-/* 802AD940  7C 08 03 A6 */	mtlr r0
-/* 802AD944  38 21 00 30 */	addi r1, r1, 0x30
-/* 802AD948  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SoundMgr/framework__10Z2SoundMgrFv.s b/asm/Z2AudioLib/Z2SoundMgr/framework__10Z2SoundMgrFv.s
deleted file mode 100644
index fac7b6caa8..0000000000
--- a/asm/Z2AudioLib/Z2SoundMgr/framework__10Z2SoundMgrFv.s
+++ /dev/null
@@ -1,14 +0,0 @@
-lbl_802AA67C:
-/* 802AA67C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802AA680  7C 08 02 A6 */	mflr r0
-/* 802AA684  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802AA688  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802AA68C  7C 7F 1B 78 */	mr r31, r3
-/* 802AA690  4B FF FB 21 */	bl calc__10Z2SoundMgrFv
-/* 802AA694  7F E3 FB 78 */	mr r3, r31
-/* 802AA698  4B FF FE 91 */	bl mixOut__10Z2SoundMgrFv
-/* 802AA69C  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802AA6A0  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802AA6A4  7C 08 03 A6 */	mtlr r0
-/* 802AA6A8  38 21 00 10 */	addi r1, r1, 0x10
-/* 802AA6AC  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SoundMgr/mixOut__10Z2SoundMgrFv.s b/asm/Z2AudioLib/Z2SoundMgr/mixOut__10Z2SoundMgrFv.s
deleted file mode 100644
index 2eb5ab9401..0000000000
--- a/asm/Z2AudioLib/Z2SoundMgr/mixOut__10Z2SoundMgrFv.s
+++ /dev/null
@@ -1,98 +0,0 @@
-lbl_802AA528:
-/* 802AA528  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 802AA52C  7C 08 02 A6 */	mflr r0
-/* 802AA530  90 01 00 24 */	stw r0, 0x24(r1)
-/* 802AA534  39 61 00 20 */	addi r11, r1, 0x20
-/* 802AA538  48 0B 7C 99 */	bl _savegpr_26
-/* 802AA53C  7C 7E 1B 78 */	mr r30, r3
-/* 802AA540  88 0D 8D C0 */	lbz r0, struct_80451340+0x0(r13)
-/* 802AA544  28 00 00 00 */	cmplwi r0, 0
-/* 802AA548  41 82 01 04 */	beq lbl_802AA64C
-/* 802AA54C  80 6D 86 00 */	lwz r3, __OSReport_disable-0x18(r13)
-/* 802AA550  88 03 00 1E */	lbz r0, 0x1e(r3)
-/* 802AA554  28 00 00 00 */	cmplwi r0, 0
-/* 802AA558  41 82 00 F4 */	beq lbl_802AA64C
-/* 802AA55C  3B E0 00 01 */	li r31, 1
-/* 802AA560  88 0D 8D C2 */	lbz r0, struct_80451340+0x2(r13)
-/* 802AA564  28 00 00 00 */	cmplwi r0, 0
-/* 802AA568  41 82 00 08 */	beq lbl_802AA570
-/* 802AA56C  3B E0 00 00 */	li r31, 0
-lbl_802AA570:
-/* 802AA570  1F BF 00 6C */	mulli r29, r31, 0x6c
-/* 802AA574  48 00 00 D0 */	b lbl_802AA644
-lbl_802AA578:
-/* 802AA578  7C 7E EA 14 */	add r3, r30, r29
-/* 802AA57C  80 03 00 80 */	lwz r0, 0x80(r3)
-/* 802AA580  7C 1B 03 78 */	mr r27, r0
-/* 802AA584  2C 00 00 00 */	cmpwi r0, 0
-/* 802AA588  40 81 00 64 */	ble lbl_802AA5EC
-/* 802AA58C  83 43 00 70 */	lwz r26, 0x70(r3)
-/* 802AA590  3C 60 80 3A */	lis r3, CUTOFF_TO_IIR_TABLE__7JASCalc@ha /* 0x8039ABB8@ha */
-/* 802AA594  3B 83 AB B8 */	addi r28, r3, CUTOFF_TO_IIR_TABLE__7JASCalc@l /* 0x8039ABB8@l */
-/* 802AA598  48 00 00 2C */	b lbl_802AA5C4
-lbl_802AA59C:
-/* 802AA59C  28 04 00 00 */	cmplwi r4, 0
-/* 802AA5A0  41 82 00 08 */	beq lbl_802AA5A8
-/* 802AA5A4  38 84 00 10 */	addi r4, r4, 0x10
-lbl_802AA5A8:
-/* 802AA5A8  7F C3 F3 78 */	mr r3, r30
-/* 802AA5AC  88 0D 8D C1 */	lbz r0, struct_80451340+0x1(r13)
-/* 802AA5B0  54 00 18 38 */	slwi r0, r0, 3
-/* 802AA5B4  7C BC 02 14 */	add r5, r28, r0
-/* 802AA5B8  4B FF FC B9 */	bl setIIR__10Z2SoundMgrFP8JAISoundPCs
-/* 802AA5BC  83 5A 00 0C */	lwz r26, 0xc(r26)
-/* 802AA5C0  3B 7B FF FF */	addi r27, r27, -1
-lbl_802AA5C4:
-/* 802AA5C4  28 1A 00 00 */	cmplwi r26, 0
-/* 802AA5C8  41 82 00 74 */	beq lbl_802AA63C
-/* 802AA5CC  2C 1B 00 00 */	cmpwi r27, 0
-/* 802AA5D0  40 81 00 6C */	ble lbl_802AA63C
-/* 802AA5D4  80 9A 00 00 */	lwz r4, 0(r26)
-/* 802AA5D8  80 64 00 B0 */	lwz r3, 0xb0(r4)
-/* 802AA5DC  3C 03 00 01 */	addis r0, r3, 1
-/* 802AA5E0  28 00 FF FF */	cmplwi r0, 0xffff
-/* 802AA5E4  40 82 FF B8 */	bne lbl_802AA59C
-/* 802AA5E8  48 00 00 54 */	b lbl_802AA63C
-lbl_802AA5EC:
-/* 802AA5EC  83 43 00 70 */	lwz r26, 0x70(r3)
-/* 802AA5F0  3C 60 80 3A */	lis r3, CUTOFF_TO_IIR_TABLE__7JASCalc@ha /* 0x8039ABB8@ha */
-/* 802AA5F4  3B 83 AB B8 */	addi r28, r3, CUTOFF_TO_IIR_TABLE__7JASCalc@l /* 0x8039ABB8@l */
-/* 802AA5F8  48 00 00 28 */	b lbl_802AA620
-lbl_802AA5FC:
-/* 802AA5FC  28 04 00 00 */	cmplwi r4, 0
-/* 802AA600  41 82 00 08 */	beq lbl_802AA608
-/* 802AA604  38 84 00 10 */	addi r4, r4, 0x10
-lbl_802AA608:
-/* 802AA608  7F C3 F3 78 */	mr r3, r30
-/* 802AA60C  88 0D 8D C1 */	lbz r0, struct_80451340+0x1(r13)
-/* 802AA610  54 00 18 38 */	slwi r0, r0, 3
-/* 802AA614  7C BC 02 14 */	add r5, r28, r0
-/* 802AA618  4B FF FC 59 */	bl setIIR__10Z2SoundMgrFP8JAISoundPCs
-/* 802AA61C  83 5A 00 0C */	lwz r26, 0xc(r26)
-lbl_802AA620:
-/* 802AA620  28 1A 00 00 */	cmplwi r26, 0
-/* 802AA624  41 82 00 18 */	beq lbl_802AA63C
-/* 802AA628  80 9A 00 00 */	lwz r4, 0(r26)
-/* 802AA62C  80 64 00 B0 */	lwz r3, 0xb0(r4)
-/* 802AA630  3C 03 00 01 */	addis r0, r3, 1
-/* 802AA634  28 00 FF FF */	cmplwi r0, 0xffff
-/* 802AA638  40 82 FF C4 */	bne lbl_802AA5FC
-lbl_802AA63C:
-/* 802AA63C  3B FF 00 01 */	addi r31, r31, 1
-/* 802AA640  3B BD 00 6C */	addi r29, r29, 0x6c
-lbl_802AA644:
-/* 802AA644  2C 1F 00 09 */	cmpwi r31, 9
-/* 802AA648  41 80 FF 30 */	blt lbl_802AA578
-lbl_802AA64C:
-/* 802AA64C  38 7E 00 04 */	addi r3, r30, 4
-/* 802AA650  4B FF 60 B5 */	bl mixOut__8JAISeMgrFv
-/* 802AA654  38 7E 07 28 */	addi r3, r30, 0x728
-/* 802AA658  4B FF 78 A5 */	bl mixOut__9JAISeqMgrFv
-/* 802AA65C  38 7E 07 9C */	addi r3, r30, 0x79c
-/* 802AA660  4B FF 9A B9 */	bl mixOut__12JAIStreamMgrFv
-/* 802AA664  39 61 00 20 */	addi r11, r1, 0x20
-/* 802AA668  48 0B 7B B5 */	bl _restgpr_26
-/* 802AA66C  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 802AA670  7C 08 03 A6 */	mtlr r0
-/* 802AA674  38 21 00 20 */	addi r1, r1, 0x20
-/* 802AA678  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SoundMgr/resetFilterAll__10Z2SoundMgrFv.s b/asm/Z2AudioLib/Z2SoundMgr/resetFilterAll__10Z2SoundMgrFv.s
deleted file mode 100644
index 56fb2f5d33..0000000000
--- a/asm/Z2AudioLib/Z2SoundMgr/resetFilterAll__10Z2SoundMgrFv.s
+++ /dev/null
@@ -1,74 +0,0 @@
-lbl_802AA430:
-/* 802AA430  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 802AA434  7C 08 02 A6 */	mflr r0
-/* 802AA438  90 01 00 24 */	stw r0, 0x24(r1)
-/* 802AA43C  39 61 00 20 */	addi r11, r1, 0x20
-/* 802AA440  48 0B 7D 95 */	bl _savegpr_27
-/* 802AA444  7C 7F 1B 78 */	mr r31, r3
-/* 802AA448  3B A0 00 01 */	li r29, 1
-/* 802AA44C  88 0D 8D C2 */	lbz r0, struct_80451340+0x2(r13)
-/* 802AA450  28 00 00 00 */	cmplwi r0, 0
-/* 802AA454  41 82 00 08 */	beq lbl_802AA45C
-/* 802AA458  3B A0 00 00 */	li r29, 0
-lbl_802AA45C:
-/* 802AA45C  1F DD 00 6C */	mulli r30, r29, 0x6c
-/* 802AA460  48 00 00 A8 */	b lbl_802AA508
-lbl_802AA464:
-/* 802AA464  7C 7F F2 14 */	add r3, r31, r30
-/* 802AA468  80 03 00 80 */	lwz r0, 0x80(r3)
-/* 802AA46C  7C 1C 03 78 */	mr r28, r0
-/* 802AA470  2C 00 00 00 */	cmpwi r0, 0
-/* 802AA474  40 81 00 50 */	ble lbl_802AA4C4
-/* 802AA478  83 63 00 70 */	lwz r27, 0x70(r3)
-/* 802AA47C  48 00 00 20 */	b lbl_802AA49C
-lbl_802AA480:
-/* 802AA480  28 04 00 00 */	cmplwi r4, 0
-/* 802AA484  41 82 00 08 */	beq lbl_802AA48C
-/* 802AA488  38 84 00 10 */	addi r4, r4, 0x10
-lbl_802AA48C:
-/* 802AA48C  7F E3 FB 78 */	mr r3, r31
-/* 802AA490  4B FF FE AD */	bl setFilterOff__10Z2SoundMgrFP8JAISound
-/* 802AA494  83 7B 00 0C */	lwz r27, 0xc(r27)
-/* 802AA498  3B 9C FF FF */	addi r28, r28, -1
-lbl_802AA49C:
-/* 802AA49C  28 1B 00 00 */	cmplwi r27, 0
-/* 802AA4A0  41 82 00 60 */	beq lbl_802AA500
-/* 802AA4A4  2C 1C 00 00 */	cmpwi r28, 0
-/* 802AA4A8  40 81 00 58 */	ble lbl_802AA500
-/* 802AA4AC  80 9B 00 00 */	lwz r4, 0(r27)
-/* 802AA4B0  80 64 00 B0 */	lwz r3, 0xb0(r4)
-/* 802AA4B4  3C 03 00 01 */	addis r0, r3, 1
-/* 802AA4B8  28 00 FF FF */	cmplwi r0, 0xffff
-/* 802AA4BC  40 82 FF C4 */	bne lbl_802AA480
-/* 802AA4C0  48 00 00 40 */	b lbl_802AA500
-lbl_802AA4C4:
-/* 802AA4C4  83 63 00 70 */	lwz r27, 0x70(r3)
-/* 802AA4C8  48 00 00 1C */	b lbl_802AA4E4
-lbl_802AA4CC:
-/* 802AA4CC  28 04 00 00 */	cmplwi r4, 0
-/* 802AA4D0  41 82 00 08 */	beq lbl_802AA4D8
-/* 802AA4D4  38 84 00 10 */	addi r4, r4, 0x10
-lbl_802AA4D8:
-/* 802AA4D8  7F E3 FB 78 */	mr r3, r31
-/* 802AA4DC  4B FF FE 61 */	bl setFilterOff__10Z2SoundMgrFP8JAISound
-/* 802AA4E0  83 7B 00 0C */	lwz r27, 0xc(r27)
-lbl_802AA4E4:
-/* 802AA4E4  28 1B 00 00 */	cmplwi r27, 0
-/* 802AA4E8  41 82 00 18 */	beq lbl_802AA500
-/* 802AA4EC  80 9B 00 00 */	lwz r4, 0(r27)
-/* 802AA4F0  80 64 00 B0 */	lwz r3, 0xb0(r4)
-/* 802AA4F4  3C 03 00 01 */	addis r0, r3, 1
-/* 802AA4F8  28 00 FF FF */	cmplwi r0, 0xffff
-/* 802AA4FC  40 82 FF D0 */	bne lbl_802AA4CC
-lbl_802AA500:
-/* 802AA500  3B BD 00 01 */	addi r29, r29, 1
-/* 802AA504  3B DE 00 6C */	addi r30, r30, 0x6c
-lbl_802AA508:
-/* 802AA508  2C 1D 00 09 */	cmpwi r29, 9
-/* 802AA50C  41 80 FF 58 */	blt lbl_802AA464
-/* 802AA510  39 61 00 20 */	addi r11, r1, 0x20
-/* 802AA514  48 0B 7D 0D */	bl _restgpr_27
-/* 802AA518  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 802AA51C  7C 08 03 A6 */	mtlr r0
-/* 802AA520  38 21 00 20 */	addi r1, r1, 0x20
-/* 802AA524  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SoundMgr/setFilterOff__10Z2SoundMgrFP8JAISound.s b/asm/Z2AudioLib/Z2SoundMgr/setFilterOff__10Z2SoundMgrFP8JAISound.s
deleted file mode 100644
index 512cb61cff..0000000000
--- a/asm/Z2AudioLib/Z2SoundMgr/setFilterOff__10Z2SoundMgrFP8JAISound.s
+++ /dev/null
@@ -1,67 +0,0 @@
-lbl_802AA33C:
-/* 802AA33C  94 21 FF D0 */	stwu r1, -0x30(r1)
-/* 802AA340  7C 08 02 A6 */	mflr r0
-/* 802AA344  90 01 00 34 */	stw r0, 0x34(r1)
-/* 802AA348  39 61 00 30 */	addi r11, r1, 0x30
-/* 802AA34C  48 0B 7E 7D */	bl _savegpr_24
-/* 802AA350  28 04 00 00 */	cmplwi r4, 0
-/* 802AA354  41 82 00 C4 */	beq lbl_802AA418
-/* 802AA358  7C 83 23 78 */	mr r3, r4
-/* 802AA35C  81 84 00 00 */	lwz r12, 0(r4)
-/* 802AA360  81 8C 00 20 */	lwz r12, 0x20(r12)
-/* 802AA364  7D 89 03 A6 */	mtctr r12
-/* 802AA368  4E 80 04 21 */	bctrl 
-/* 802AA36C  7C 7C 1B 78 */	mr r28, r3
-/* 802AA370  3B 20 00 00 */	li r25, 0
-/* 802AA374  3B E0 00 00 */	li r31, 0
-lbl_802AA378:
-/* 802AA378  38 1F 01 30 */	addi r0, r31, 0x130
-/* 802AA37C  7F 7C 00 2E */	lwzx r27, r28, r0
-/* 802AA380  28 1B 00 00 */	cmplwi r27, 0
-/* 802AA384  41 82 00 84 */	beq lbl_802AA408
-/* 802AA388  88 1B 02 15 */	lbz r0, 0x215(r27)
-/* 802AA38C  28 00 00 01 */	cmplwi r0, 1
-/* 802AA390  40 82 00 78 */	bne lbl_802AA408
-/* 802AA394  7F 63 DB 78 */	mr r3, r27
-/* 802AA398  3C 80 80 3A */	lis r4, cResetFilterTable@ha /* 0x8039B9C0@ha */
-/* 802AA39C  38 84 B9 C0 */	addi r4, r4, cResetFilterTable@l /* 0x8039B9C0@l */
-/* 802AA3A0  4B FE 84 FD */	bl setIIR__8JASTrackFPCs
-/* 802AA3A4  7F 63 DB 78 */	mr r3, r27
-/* 802AA3A8  3C 80 80 3A */	lis r4, cResetFilterTable@ha /* 0x8039B9C0@ha */
-/* 802AA3AC  38 84 B9 C0 */	addi r4, r4, cResetFilterTable@l /* 0x8039B9C0@l */
-/* 802AA3B0  4B FE 84 AD */	bl setFIR__8JASTrackFPCs
-/* 802AA3B4  3B 00 00 00 */	li r24, 0
-/* 802AA3B8  3B C0 00 00 */	li r30, 0
-/* 802AA3BC  3C 60 80 3A */	lis r3, cResetFilterTable@ha /* 0x8039B9C0@ha */
-/* 802AA3C0  3B A3 B9 C0 */	addi r29, r3, cResetFilterTable@l /* 0x8039B9C0@l */
-lbl_802AA3C4:
-/* 802AA3C4  38 1E 01 30 */	addi r0, r30, 0x130
-/* 802AA3C8  7F 5B 00 2E */	lwzx r26, r27, r0
-/* 802AA3CC  28 1A 00 00 */	cmplwi r26, 0
-/* 802AA3D0  41 82 00 28 */	beq lbl_802AA3F8
-/* 802AA3D4  88 1A 02 15 */	lbz r0, 0x215(r26)
-/* 802AA3D8  28 00 00 01 */	cmplwi r0, 1
-/* 802AA3DC  40 82 00 1C */	bne lbl_802AA3F8
-/* 802AA3E0  7F 43 D3 78 */	mr r3, r26
-/* 802AA3E4  7F A4 EB 78 */	mr r4, r29
-/* 802AA3E8  4B FE 84 B5 */	bl setIIR__8JASTrackFPCs
-/* 802AA3EC  7F 43 D3 78 */	mr r3, r26
-/* 802AA3F0  7F A4 EB 78 */	mr r4, r29
-/* 802AA3F4  4B FE 84 69 */	bl setFIR__8JASTrackFPCs
-lbl_802AA3F8:
-/* 802AA3F8  3B 18 00 01 */	addi r24, r24, 1
-/* 802AA3FC  28 18 00 04 */	cmplwi r24, 4
-/* 802AA400  3B DE 00 04 */	addi r30, r30, 4
-/* 802AA404  41 80 FF C0 */	blt lbl_802AA3C4
-lbl_802AA408:
-/* 802AA408  3B 39 00 01 */	addi r25, r25, 1
-/* 802AA40C  28 19 00 04 */	cmplwi r25, 4
-/* 802AA410  3B FF 00 04 */	addi r31, r31, 4
-/* 802AA414  41 80 FF 64 */	blt lbl_802AA378
-lbl_802AA418:
-/* 802AA418  39 61 00 30 */	addi r11, r1, 0x30
-/* 802AA41C  48 0B 7D F9 */	bl _restgpr_24
-/* 802AA420  80 01 00 34 */	lwz r0, 0x34(r1)
-/* 802AA424  7C 08 03 A6 */	mtlr r0
-/* 802AA428  38 21 00 30 */	addi r1, r1, 0x30
-/* 802AA42C  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SoundMgr/setIIR__10Z2SoundMgrFP8JAISoundPCs.s b/asm/Z2AudioLib/Z2SoundMgr/setIIR__10Z2SoundMgrFP8JAISoundPCs.s
deleted file mode 100644
index 75df5f83cf..0000000000
--- a/asm/Z2AudioLib/Z2SoundMgr/setIIR__10Z2SoundMgrFP8JAISoundPCs.s
+++ /dev/null
@@ -1,57 +0,0 @@
-lbl_802AA270:
-/* 802AA270  94 21 FF D0 */	stwu r1, -0x30(r1)
-/* 802AA274  7C 08 02 A6 */	mflr r0
-/* 802AA278  90 01 00 34 */	stw r0, 0x34(r1)
-/* 802AA27C  39 61 00 30 */	addi r11, r1, 0x30
-/* 802AA280  48 0B 7F 4D */	bl _savegpr_25
-/* 802AA284  7C B9 2B 78 */	mr r25, r5
-/* 802AA288  28 04 00 00 */	cmplwi r4, 0
-/* 802AA28C  41 82 00 98 */	beq lbl_802AA324
-/* 802AA290  7C 83 23 78 */	mr r3, r4
-/* 802AA294  81 84 00 00 */	lwz r12, 0(r4)
-/* 802AA298  81 8C 00 20 */	lwz r12, 0x20(r12)
-/* 802AA29C  7D 89 03 A6 */	mtctr r12
-/* 802AA2A0  4E 80 04 21 */	bctrl 
-/* 802AA2A4  7C 7D 1B 78 */	mr r29, r3
-/* 802AA2A8  3B 60 00 00 */	li r27, 0
-/* 802AA2AC  3B E0 00 00 */	li r31, 0
-lbl_802AA2B0:
-/* 802AA2B0  38 1F 01 30 */	addi r0, r31, 0x130
-/* 802AA2B4  7F 9D 00 2E */	lwzx r28, r29, r0
-/* 802AA2B8  28 1C 00 00 */	cmplwi r28, 0
-/* 802AA2BC  41 82 00 58 */	beq lbl_802AA314
-/* 802AA2C0  88 1C 02 15 */	lbz r0, 0x215(r28)
-/* 802AA2C4  28 00 00 01 */	cmplwi r0, 1
-/* 802AA2C8  40 82 00 4C */	bne lbl_802AA314
-/* 802AA2CC  7F 83 E3 78 */	mr r3, r28
-/* 802AA2D0  7F 24 CB 78 */	mr r4, r25
-/* 802AA2D4  4B FE 85 C9 */	bl setIIR__8JASTrackFPCs
-/* 802AA2D8  3B 40 00 00 */	li r26, 0
-/* 802AA2DC  3B C0 00 00 */	li r30, 0
-lbl_802AA2E0:
-/* 802AA2E0  38 1E 01 30 */	addi r0, r30, 0x130
-/* 802AA2E4  7C 7C 00 2E */	lwzx r3, r28, r0
-/* 802AA2E8  28 03 00 00 */	cmplwi r3, 0
-/* 802AA2EC  41 82 00 18 */	beq lbl_802AA304
-/* 802AA2F0  88 03 02 15 */	lbz r0, 0x215(r3)
-/* 802AA2F4  28 00 00 01 */	cmplwi r0, 1
-/* 802AA2F8  40 82 00 0C */	bne lbl_802AA304
-/* 802AA2FC  7F 24 CB 78 */	mr r4, r25
-/* 802AA300  4B FE 85 9D */	bl setIIR__8JASTrackFPCs
-lbl_802AA304:
-/* 802AA304  3B 5A 00 01 */	addi r26, r26, 1
-/* 802AA308  28 1A 00 04 */	cmplwi r26, 4
-/* 802AA30C  3B DE 00 04 */	addi r30, r30, 4
-/* 802AA310  41 80 FF D0 */	blt lbl_802AA2E0
-lbl_802AA314:
-/* 802AA314  3B 7B 00 01 */	addi r27, r27, 1
-/* 802AA318  28 1B 00 04 */	cmplwi r27, 4
-/* 802AA31C  3B FF 00 04 */	addi r31, r31, 4
-/* 802AA320  41 80 FF 90 */	blt lbl_802AA2B0
-lbl_802AA324:
-/* 802AA324  39 61 00 30 */	addi r11, r1, 0x30
-/* 802AA328  48 0B 7E F1 */	bl _restgpr_25
-/* 802AA32C  80 01 00 34 */	lwz r0, 0x34(r1)
-/* 802AA330  7C 08 03 A6 */	mtlr r0
-/* 802AA334  38 21 00 30 */	addi r1, r1, 0x30
-/* 802AA338  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SoundMgr/stopSoundID__10Z2SoundMgrF10JAISoundID.s b/asm/Z2AudioLib/Z2SoundMgr/stopSoundID__10Z2SoundMgrF10JAISoundID.s
deleted file mode 100644
index 18cfc87901..0000000000
--- a/asm/Z2AudioLib/Z2SoundMgr/stopSoundID__10Z2SoundMgrF10JAISoundID.s
+++ /dev/null
@@ -1,29 +0,0 @@
-lbl_802AA7DC:
-/* 802AA7DC  94 21 FF E0 */	stwu r1, -0x20(r1)
-/* 802AA7E0  7C 08 02 A6 */	mflr r0
-/* 802AA7E4  90 01 00 24 */	stw r0, 0x24(r1)
-/* 802AA7E8  93 E1 00 1C */	stw r31, 0x1c(r1)
-/* 802AA7EC  93 C1 00 18 */	stw r30, 0x18(r1)
-/* 802AA7F0  7C 7E 1B 78 */	mr r30, r3
-/* 802AA7F4  7C 9F 23 78 */	mr r31, r4
-/* 802AA7F8  80 04 00 00 */	lwz r0, 0(r4)
-/* 802AA7FC  90 01 00 10 */	stw r0, 0x10(r1)
-/* 802AA800  38 7E 00 04 */	addi r3, r30, 4
-/* 802AA804  38 81 00 10 */	addi r4, r1, 0x10
-/* 802AA808  4B FF 5A ED */	bl stopSoundID__8JAISeMgrF10JAISoundID
-/* 802AA80C  80 1F 00 00 */	lwz r0, 0(r31)
-/* 802AA810  90 01 00 0C */	stw r0, 0xc(r1)
-/* 802AA814  38 7E 07 28 */	addi r3, r30, 0x728
-/* 802AA818  38 81 00 0C */	addi r4, r1, 0xc
-/* 802AA81C  4B FF 76 71 */	bl stopSoundID__9JAISeqMgrF10JAISoundID
-/* 802AA820  80 1F 00 00 */	lwz r0, 0(r31)
-/* 802AA824  90 01 00 08 */	stw r0, 8(r1)
-/* 802AA828  38 7E 07 9C */	addi r3, r30, 0x79c
-/* 802AA82C  38 81 00 08 */	addi r4, r1, 8
-/* 802AA830  4B FF 98 89 */	bl stopSoundID__12JAIStreamMgrF10JAISoundID
-/* 802AA834  83 E1 00 1C */	lwz r31, 0x1c(r1)
-/* 802AA838  83 C1 00 18 */	lwz r30, 0x18(r1)
-/* 802AA83C  80 01 00 24 */	lwz r0, 0x24(r1)
-/* 802AA840  7C 08 03 A6 */	mtlr r0
-/* 802AA844  38 21 00 20 */	addi r1, r1, 0x20
-/* 802AA848  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SoundMgr/stopSync__10Z2SoundMgrFv.s b/asm/Z2AudioLib/Z2SoundMgr/stopSync__10Z2SoundMgrFv.s
deleted file mode 100644
index cc957c983b..0000000000
--- a/asm/Z2AudioLib/Z2SoundMgr/stopSync__10Z2SoundMgrFv.s
+++ /dev/null
@@ -1,36 +0,0 @@
-lbl_802AA84C:
-/* 802AA84C  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802AA850  7C 08 02 A6 */	mflr r0
-/* 802AA854  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802AA858  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802AA85C  7C 7F 1B 78 */	mr r31, r3
-/* 802AA860  48 00 00 69 */	bl stop__10Z2SoundMgrFv
-/* 802AA864  48 00 00 34 */	b lbl_802AA898
-lbl_802AA868:
-/* 802AA868  7F E3 FB 78 */	mr r3, r31
-/* 802AA86C  4B FF F9 45 */	bl calc__10Z2SoundMgrFv
-/* 802AA870  38 7F 00 04 */	addi r3, r31, 4
-/* 802AA874  4B FF 60 5D */	bl getNumActiveSe__8JAISeMgrCFv
-/* 802AA878  2C 03 00 00 */	cmpwi r3, 0
-/* 802AA87C  40 82 00 10 */	bne lbl_802AA88C
-/* 802AA880  80 1F 07 94 */	lwz r0, 0x794(r31)
-/* 802AA884  2C 00 00 00 */	cmpwi r0, 0
-/* 802AA888  41 82 00 2C */	beq lbl_802AA8B4
-lbl_802AA88C:
-/* 802AA88C  7F E3 FB 78 */	mr r3, r31
-/* 802AA890  4B FF FC 99 */	bl mixOut__10Z2SoundMgrFv
-/* 802AA894  4B FF 38 F5 */	bl waitSubFrame__9JASDriverFv
-lbl_802AA898:
-/* 802AA898  38 7F 00 04 */	addi r3, r31, 4
-/* 802AA89C  4B FF 60 35 */	bl getNumActiveSe__8JAISeMgrCFv
-/* 802AA8A0  2C 03 00 00 */	cmpwi r3, 0
-/* 802AA8A4  41 81 FF C4 */	bgt lbl_802AA868
-/* 802AA8A8  80 1F 07 94 */	lwz r0, 0x794(r31)
-/* 802AA8AC  2C 00 00 00 */	cmpwi r0, 0
-/* 802AA8B0  41 81 FF B8 */	bgt lbl_802AA868
-lbl_802AA8B4:
-/* 802AA8B4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802AA8B8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802AA8BC  7C 08 03 A6 */	mtlr r0
-/* 802AA8C0  38 21 00 10 */	addi r1, r1, 0x10
-/* 802AA8C4  4E 80 00 20 */	blr 
diff --git a/asm/Z2AudioLib/Z2SoundMgr/stop__10Z2SoundMgrFv.s b/asm/Z2AudioLib/Z2SoundMgr/stop__10Z2SoundMgrFv.s
deleted file mode 100644
index f2fc6d4617..0000000000
--- a/asm/Z2AudioLib/Z2SoundMgr/stop__10Z2SoundMgrFv.s
+++ /dev/null
@@ -1,17 +0,0 @@
-lbl_802AA8C8:
-/* 802AA8C8  94 21 FF F0 */	stwu r1, -0x10(r1)
-/* 802AA8CC  7C 08 02 A6 */	mflr r0
-/* 802AA8D0  90 01 00 14 */	stw r0, 0x14(r1)
-/* 802AA8D4  93 E1 00 0C */	stw r31, 0xc(r1)
-/* 802AA8D8  7C 7F 1B 78 */	mr r31, r3
-/* 802AA8DC  38 7F 00 04 */	addi r3, r31, 4
-/* 802AA8E0  4B FF 59 C1 */	bl stop__8JAISeMgrFv
-/* 802AA8E4  38 7F 07 28 */	addi r3, r31, 0x728
-/* 802AA8E8  4B FF 75 15 */	bl stop__9JAISeqMgrFv
-/* 802AA8EC  38 7F 07 9C */	addi r3, r31, 0x79c
-/* 802AA8F0  4B FF 97 39 */	bl stop__12JAIStreamMgrFv
-/* 802AA8F4  83 E1 00 0C */	lwz r31, 0xc(r1)
-/* 802AA8F8  80 01 00 14 */	lwz r0, 0x14(r1)
-/* 802AA8FC  7C 08 03 A6 */	mtlr r0
-/* 802AA900  38 21 00 10 */	addi r1, r1, 0x10
-/* 802AA904  4E 80 00 20 */	blr