Adds JSUList, JKRDisposer, and JKRHeap. (#4)

* Added JSUList, JKRDisposer, and JKRHeap.

JSUList: Decompiled JSUPtrLink and JSUPtrList with their respected
functions. The templated class JSUList is left.

JKRDisposer: Constructor matched but the destructor is close but
not yet a match.

JKRHeap: No functions matches yet. JKRHeap.cpp now includes
"operator delete" which makes it possible to forward compile
destructors.

* moved files from src/ to libs/

14 files changed, 65 insertions, 65 deletions

diff --git a/asm/Z2AudioLib/Z2Audience.s b/asm/Z2AudioLib/Z2Audience.s
index 1ad8fa8c42..4417d00d84 100644
--- a/asm/Z2AudioLib/Z2Audience.s
+++ b/asm/Z2AudioLib/Z2Audience.s
@@ -1544,7 +1544,7 @@ lbl_802BD250:
 /* 802BD25C 002BA19C  7F E0 07 35 */	extsh. r0, r31
 /* 802BD260 002BA1A0  40 81 00 0C */	ble lbl_802BD26C
 /* 802BD264 002BA1A4  7F C3 F3 78 */	mr r3, r30
-/* 802BD268 002BA1A8  48 01 1A D5 */	bl __dl
+/* 802BD268 002BA1A8  48 01 1A D5 */	bl __dl__FPv
 lbl_802BD26C:
 /* 802BD26C 002BA1AC  7F C3 F3 78 */	mr r3, r30
 /* 802BD270 002BA1B0  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -1568,7 +1568,7 @@ JASMemPool_NS_dtor_X5_:
 /* 802BD2B0 002BA1F0  7F E0 07 35 */	extsh. r0, r31
 /* 802BD2B4 002BA1F4  40 81 00 0C */	ble lbl_802BD2C0
 /* 802BD2B8 002BA1F8  7F C3 F3 78 */	mr r3, r30
-/* 802BD2BC 002BA1FC  48 01 1A 81 */	bl __dl
+/* 802BD2BC 002BA1FC  48 01 1A 81 */	bl __dl__FPv
 lbl_802BD2C0:
 /* 802BD2C0 002BA200  7F C3 F3 78 */	mr r3, r30
 /* 802BD2C4 002BA204  83 E1 00 0C */	lwz r31, 0xc(r1)
diff --git a/asm/Z2AudioLib/Z2AudioArcLoader.s b/asm/Z2AudioLib/Z2AudioArcLoader.s
index 22457cc52f..fb0b307066 100644
--- a/asm/Z2AudioLib/Z2AudioArcLoader.s
+++ b/asm/Z2AudioLib/Z2AudioArcLoader.s
@@ -106,7 +106,7 @@ lbl_802A9B9C:
 /* 802A9B9C 002A6ADC  7F E0 07 35 */	extsh. r0, r31
 /* 802A9BA0 002A6AE0  40 81 00 0C */	ble lbl_802A9BAC
 /* 802A9BA4 002A6AE4  7F C3 F3 78 */	mr r3, r30
-/* 802A9BA8 002A6AE8  48 02 51 95 */	bl __dl
+/* 802A9BA8 002A6AE8  48 02 51 95 */	bl __dl__FPv
 lbl_802A9BAC:
 /* 802A9BAC 002A6AEC  7F C3 F3 78 */	mr r3, r30
 /* 802A9BB0 002A6AF0  83 E1 00 0C */	lwz r31, 0xc(r1)
diff --git a/asm/Z2AudioLib/Z2AudioMgr.s b/asm/Z2AudioLib/Z2AudioMgr.s
index aed923eee2..e9d083c04c 100644
--- a/asm/Z2AudioLib/Z2AudioMgr.s
+++ b/asm/Z2AudioLib/Z2AudioMgr.s
@@ -193,7 +193,7 @@ Z2AudioMgr_NS_init:
 /* 802CD51C 002CA45C  38 60 00 50 */	li r3, 0x50
 /* 802CD520 002CA460  7F 64 DB 78 */	mr r4, r27
 /* 802CD524 002CA464  38 A0 00 00 */	li r5, 0
-/* 802CD528 002CA468  48 00 17 71 */	bl __nw_X2_
+/* 802CD528 002CA468  48 00 17 71 */	bl __nw__FUlP7JKRHeapi
 /* 802CD52C 002CA46C  7C 7B 1B 79 */	or. r27, r3, r3
 /* 802CD530 002CA470  41 82 00 9C */	beq lbl_802CD5CC
 /* 802CD534 002CA474  3C 60 80 3D */	lis r3, lbl_803C9A08@ha
@@ -423,7 +423,7 @@ lbl_802CD838:
 /* 802CD85C 002CA79C  7F E0 07 35 */	extsh. r0, r31
 /* 802CD860 002CA7A0  40 81 00 0C */	ble lbl_802CD86C
 /* 802CD864 002CA7A4  7F C3 F3 78 */	mr r3, r30
-/* 802CD868 002CA7A8  48 00 14 D5 */	bl __dl
+/* 802CD868 002CA7A8  48 00 14 D5 */	bl __dl__FPv
 lbl_802CD86C:
 /* 802CD86C 002CA7AC  7F C3 F3 78 */	mr r3, r30
 /* 802CD870 002CA7B0  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -679,7 +679,7 @@ lbl_802CDBDC:
 /* 802CDBDC 002CAB1C  7F E0 07 35 */	extsh. r0, r31
 /* 802CDBE0 002CAB20  40 81 00 0C */	ble lbl_802CDBEC
 /* 802CDBE4 002CAB24  7F C3 F3 78 */	mr r3, r30
-/* 802CDBE8 002CAB28  48 00 11 55 */	bl __dl
+/* 802CDBE8 002CAB28  48 00 11 55 */	bl __dl__FPv
 lbl_802CDBEC:
 /* 802CDBEC 002CAB2C  7F C3 F3 78 */	mr r3, r30
 /* 802CDBF0 002CAB30  83 E1 00 0C */	lwz r31, 0xc(r1)
diff --git a/asm/Z2AudioLib/Z2Creature.s b/asm/Z2AudioLib/Z2Creature.s
index 2dde586f51..c4f07c681b 100644
--- a/asm/Z2AudioLib/Z2Creature.s
+++ b/asm/Z2AudioLib/Z2Creature.s
@@ -75,7 +75,7 @@ lbl_802C04BC:
 /* 802C04BC 002BD3FC  7F E0 07 35 */	extsh. r0, r31
 /* 802C04C0 002BD400  40 81 00 0C */	ble lbl_802C04CC
 /* 802C04C4 002BD404  7F C3 F3 78 */	mr r3, r30
-/* 802C04C8 002BD408  48 00 E8 75 */	bl __dl
+/* 802C04C8 002BD408  48 00 E8 75 */	bl __dl__FPv
 lbl_802C04CC:
 /* 802C04CC 002BD40C  7F C3 F3 78 */	mr r3, r30
 /* 802C04D0 002BD410  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -593,7 +593,7 @@ lbl_802C0B60:
 /* 802C0C24 002BDB64  4B FF F7 A5 */	bl Z2Creature
 /* 802C0C28 002BDB68  38 7F 00 90 */	addi r3, r31, 0x90
 /* 802C0C2C 002BDB6C  7F E4 FB 78 */	mr r4, r31
-/* 802C0C30 002BDB70  48 01 B1 CD */	bl JSUPtrLink
+/* 802C0C30 002BDB70  48 01 B1 CD */	bl __ct__10JSUPtrLinkFPv
 /* 802C0C34 002BDB74  3C 60 80 3D */	lis r3, lbl_803CB890@ha
 /* 802C0C38 002BDB78  38 03 B8 90 */	addi r0, r3, lbl_803CB890@l
 /* 802C0C3C 002BDB7C  90 1F 00 00 */	stw r0, 0(r31)
@@ -623,7 +623,7 @@ lbl_802C0B60:
 /* 802C0C9C 002BDBDC  41 82 00 10 */	beq lbl_802C0CAC
 /* 802C0CA0 002BDBE0  38 7E 00 90 */	addi r3, r30, 0x90
 /* 802C0CA4 002BDBE4  38 80 00 00 */	li r4, 0
-/* 802C0CA8 002BDBE8  48 01 B1 6D */	bl JSUPtrLink_NS_dtor
+/* 802C0CA8 002BDBE8  48 01 B1 6D */	bl __dt__10JSUPtrLinkFv
 lbl_802C0CAC:
 /* 802C0CAC 002BDBEC  7F C3 F3 78 */	mr r3, r30
 /* 802C0CB0 002BDBF0  38 80 00 00 */	li r4, 0
@@ -631,7 +631,7 @@ lbl_802C0CAC:
 /* 802C0CB8 002BDBF8  7F E0 07 35 */	extsh. r0, r31
 /* 802C0CBC 002BDBFC  40 81 00 0C */	ble lbl_802C0CC8
 /* 802C0CC0 002BDC00  7F C3 F3 78 */	mr r3, r30
-/* 802C0CC4 002BDC04  48 00 E0 79 */	bl __dl
+/* 802C0CC4 002BDC04  48 00 E0 79 */	bl __dl__FPv
 lbl_802C0CC8:
 /* 802C0CC8 002BDC08  7F C3 F3 78 */	mr r3, r30
 /* 802C0CCC 002BDC0C  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -827,7 +827,7 @@ Z2CreatureEnemy:
 /* 802C0F78 002BDEB8  4B FF F4 51 */	bl Z2Creature
 /* 802C0F7C 002BDEBC  38 7F 00 90 */	addi r3, r31, 0x90
 /* 802C0F80 002BDEC0  7F E4 FB 78 */	mr r4, r31
-/* 802C0F84 002BDEC4  48 01 AE 79 */	bl JSUPtrLink
+/* 802C0F84 002BDEC4  48 01 AE 79 */	bl __ct__10JSUPtrLinkFPv
 /* 802C0F88 002BDEC8  3C 60 80 3D */	lis r3, lbl_803CB860@ha
 /* 802C0F8C 002BDECC  38 03 B8 60 */	addi r0, r3, lbl_803CB860@l
 /* 802C0F90 002BDED0  90 1F 00 00 */	stw r0, 0(r31)
@@ -975,7 +975,7 @@ lbl_802C10F8:
 /* 802C11AC 002BE0EC  38 9D 00 90 */	addi r4, r29, 0x90
 lbl_802C11B0:
 /* 802C11B0 002BE0F0  80 6D 85 C8 */	lwz r3, lbl_80450B48-_SDA_BASE_(r13)
-/* 802C11B4 002BE0F4  48 01 AF A9 */	bl JSUPtrList_NS_remove
+/* 802C11B4 002BE0F4  48 01 AF A9 */	bl remove__10JSUPtrListFP10JSUPtrLink
 /* 802C11B8 002BE0F8  48 00 01 3C */	b lbl_802C12F4
 lbl_802C11BC:
 /* 802C11BC 002BE0FC  88 1D 00 A3 */	lbz r0, 0xa3(r29)
@@ -991,7 +991,7 @@ lbl_802C11BC:
 /* 802C11E4 002BE124  38 9D 00 90 */	addi r4, r29, 0x90
 lbl_802C11E8:
 /* 802C11E8 002BE128  80 6D 85 C8 */	lwz r3, lbl_80450B48-_SDA_BASE_(r13)
-/* 802C11EC 002BE12C  48 01 AD 61 */	bl JSUPtrList_NS_append
+/* 802C11EC 002BE12C  48 01 AD 61 */	bl append__10JSUPtrListFP10JSUPtrLink
 /* 802C11F0 002BE130  48 00 01 04 */	b lbl_802C12F4
 /* 802C11F4 002BE134  28 1F 00 00 */	cmplwi r31, 0
 /* 802C11F8 002BE138  41 82 00 FC */	beq lbl_802C12F4
diff --git a/asm/Z2AudioLib/Z2EnvSeMgr.s b/asm/Z2AudioLib/Z2EnvSeMgr.s
index 46942c84ce..07587b1c0a 100644
--- a/asm/Z2AudioLib/Z2EnvSeMgr.s
+++ b/asm/Z2AudioLib/Z2EnvSeMgr.s
@@ -28,7 +28,7 @@ lbl_802C58DC:
 /* 802C58DC 002C281C  7F E0 07 35 */	extsh. r0, r31
 /* 802C58E0 002C2820  40 81 00 0C */	ble lbl_802C58EC
 /* 802C58E4 002C2824  7F C3 F3 78 */	mr r3, r30
-/* 802C58E8 002C2828  48 00 94 55 */	bl __dl
+/* 802C58E8 002C2828  48 00 94 55 */	bl __dl__FPv
 lbl_802C58EC:
 /* 802C58EC 002C282C  7F C3 F3 78 */	mr r3, r30
 /* 802C58F0 002C2830  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -334,7 +334,7 @@ Z2EnvSeDir_NS_dtor:
 /* 802C5D44 002C2C84  7F E0 07 35 */	extsh. r0, r31
 /* 802C5D48 002C2C88  40 81 00 0C */	ble lbl_802C5D54
 /* 802C5D4C 002C2C8C  7F C3 F3 78 */	mr r3, r30
-/* 802C5D50 002C2C90  48 00 8F ED */	bl __dl
+/* 802C5D50 002C2C90  48 00 8F ED */	bl __dl__FPv
 lbl_802C5D54:
 /* 802C5D54 002C2C94  7F C3 F3 78 */	mr r3, r30
 /* 802C5D58 002C2C98  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -483,7 +483,7 @@ Z2EnvSeAutoPan_NS_dtor:
 /* 802C5F50 002C2E90  7F E0 07 35 */	extsh. r0, r31
 /* 802C5F54 002C2E94  40 81 00 0C */	ble lbl_802C5F60
 /* 802C5F58 002C2E98  7F C3 F3 78 */	mr r3, r30
-/* 802C5F5C 002C2E9C  48 00 8D E1 */	bl __dl
+/* 802C5F5C 002C2E9C  48 00 8D E1 */	bl __dl__FPv
 lbl_802C5F60:
 /* 802C5F60 002C2EA0  7F C3 F3 78 */	mr r3, r30
 /* 802C5F64 002C2EA4  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -965,7 +965,7 @@ lbl_802C6684:
 /* 802C6684 002C35C4  7F E0 07 35 */	extsh. r0, r31
 /* 802C6688 002C35C8  40 81 00 0C */	ble lbl_802C6694
 /* 802C668C 002C35CC  7F C3 F3 78 */	mr r3, r30
-/* 802C6690 002C35D0  48 00 86 AD */	bl __dl
+/* 802C6690 002C35D0  48 00 86 AD */	bl __dl__FPv
 lbl_802C6694:
 /* 802C6694 002C35D4  7F C3 F3 78 */	mr r3, r30
 /* 802C6698 002C35D8  83 E1 00 0C */	lwz r31, 0xc(r1)
diff --git a/asm/Z2AudioLib/Z2FxLineMgr.s b/asm/Z2AudioLib/Z2FxLineMgr.s
index d0968b3a8c..8a7b3901b8 100644
--- a/asm/Z2AudioLib/Z2FxLineMgr.s
+++ b/asm/Z2AudioLib/Z2FxLineMgr.s
@@ -27,22 +27,22 @@ Z2FxLineMgr_NS_initDataArc:
 /* 802BA81C 002B775C  38 60 28 00 */	li r3, 0x2800
 /* 802BA820 002B7760  7E C4 B3 78 */	mr r4, r22
 /* 802BA824 002B7764  38 A0 00 20 */	li r5, 0x20
-/* 802BA828 002B7768  48 01 44 E9 */	bl __nwa_X2_
+/* 802BA828 002B7768  48 01 44 E9 */	bl __nwa__FUlP7JKRHeapi
 /* 802BA82C 002B776C  90 77 00 04 */	stw r3, 4(r23)
 /* 802BA830 002B7770  38 60 28 00 */	li r3, 0x2800
 /* 802BA834 002B7774  7E C4 B3 78 */	mr r4, r22
 /* 802BA838 002B7778  38 A0 00 20 */	li r5, 0x20
-/* 802BA83C 002B777C  48 01 44 D5 */	bl __nwa_X2_
+/* 802BA83C 002B777C  48 01 44 D5 */	bl __nwa__FUlP7JKRHeapi
 /* 802BA840 002B7780  90 77 00 08 */	stw r3, 8(r23)
 /* 802BA844 002B7784  38 60 4B 00 */	li r3, 0x4b00
 /* 802BA848 002B7788  7E C4 B3 78 */	mr r4, r22
 /* 802BA84C 002B778C  38 A0 00 20 */	li r5, 0x20
-/* 802BA850 002B7790  48 01 44 C1 */	bl __nwa_X2_
+/* 802BA850 002B7790  48 01 44 C1 */	bl __nwa__FUlP7JKRHeapi
 /* 802BA854 002B7794  90 77 00 0C */	stw r3, 0xc(r23)
 /* 802BA858 002B7798  38 60 4B 00 */	li r3, 0x4b00
 /* 802BA85C 002B779C  7E C4 B3 78 */	mr r4, r22
 /* 802BA860 002B77A0  38 A0 00 20 */	li r5, 0x20
-/* 802BA864 002B77A4  48 01 44 AD */	bl __nwa_X2_
+/* 802BA864 002B77A4  48 01 44 AD */	bl __nwa__FUlP7JKRHeapi
 /* 802BA868 002B77A8  90 77 00 10 */	stw r3, 0x10(r23)
 /* 802BA86C 002B77AC  7F 03 C3 78 */	mr r3, r24
 /* 802BA870 002B77B0  48 01 B8 9D */	bl JKRArchive_NS_countResource
@@ -51,7 +51,7 @@ Z2FxLineMgr_NS_initDataArc:
 /* 802BA87C 002B77BC  1C 60 00 30 */	mulli r3, r0, 0x30
 /* 802BA880 002B77C0  7E C4 B3 78 */	mr r4, r22
 /* 802BA884 002B77C4  38 A0 00 00 */	li r5, 0
-/* 802BA888 002B77C8  48 01 44 89 */	bl __nwa_X2_
+/* 802BA888 002B77C8  48 01 44 89 */	bl __nwa__FUlP7JKRHeapi
 /* 802BA88C 002B77CC  90 77 00 00 */	stw r3, 0(r23)
 /* 802BA890 002B77D0  3B 40 00 00 */	li r26, 0
 /* 802BA894 002B77D4  3A C1 00 08 */	addi r22, r1, 8
@@ -257,7 +257,7 @@ lbl_802BA8BC:
 /* 802BABB0 002B7AF0  48 02 16 E9 */	bl JSUInputStream_NS_read
 /* 802BABB4 002B7AF4  7F 23 CB 78 */	mr r3, r25
 /* 802BABB8 002B7AF8  38 80 00 00 */	li r4, 0
-/* 802BABBC 002B7AFC  48 01 39 45 */	bl JKRHeap_NS_free
+/* 802BABBC 002B7AFC  48 01 39 45 */	bl free__7JKRHeapFPvP7JKRHeap
 /* 802BABC0 002B7B00  93 E1 00 08 */	stw r31, 8(r1)
 /* 802BABC4 002B7B04  93 C1 00 08 */	stw r30, 8(r1)
 /* 802BABC8 002B7B08  38 61 00 08 */	addi r3, r1, 8
diff --git a/asm/Z2AudioLib/Z2LinkMgr.s b/asm/Z2AudioLib/Z2LinkMgr.s
index b0a66a8e71..64efa28e7c 100644
--- a/asm/Z2AudioLib/Z2LinkMgr.s
+++ b/asm/Z2AudioLib/Z2LinkMgr.s
@@ -205,7 +205,7 @@ lbl_802C34D4:
 /* 802C34D4 002C0414  7F E0 07 35 */	extsh. r0, r31
 /* 802C34D8 002C0418  40 81 00 0C */	ble lbl_802C34E4
 /* 802C34DC 002C041C  7F C3 F3 78 */	mr r3, r30
-/* 802C34E0 002C0420  48 00 B8 5D */	bl __dl
+/* 802C34E0 002C0420  48 00 B8 5D */	bl __dl__FPv
 lbl_802C34E4:
 /* 802C34E4 002C0424  7F C3 F3 78 */	mr r3, r30
 /* 802C34E8 002C0428  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -275,7 +275,7 @@ lbl_802C35C0:
 /* 802C35CC 002C050C  7F C0 07 35 */	extsh. r0, r30
 /* 802C35D0 002C0510  40 81 00 0C */	ble lbl_802C35DC
 /* 802C35D4 002C0514  7F E3 FB 78 */	mr r3, r31
-/* 802C35D8 002C0518  48 00 B7 65 */	bl __dl
+/* 802C35D8 002C0518  48 00 B7 65 */	bl __dl__FPv
 lbl_802C35DC:
 /* 802C35DC 002C051C  7F E3 FB 78 */	mr r3, r31
 /* 802C35E0 002C0520  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -2192,7 +2192,7 @@ lbl_802C50E8:
 /* 802C50E8 002C2028  7F E0 07 35 */	extsh. r0, r31
 /* 802C50EC 002C202C  40 81 00 0C */	ble lbl_802C50F8
 /* 802C50F0 002C2030  7F C3 F3 78 */	mr r3, r30
-/* 802C50F4 002C2034  48 00 9C 49 */	bl __dl
+/* 802C50F4 002C2034  48 00 9C 49 */	bl __dl__FPv
 lbl_802C50F8:
 /* 802C50F8 002C2038  7F C3 F3 78 */	mr r3, r30
 /* 802C50FC 002C203C  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -2252,7 +2252,7 @@ lbl_802C51B4:
 /* 802C51C0 002C2100  7F E0 07 35 */	extsh. r0, r31
 /* 802C51C4 002C2104  40 81 00 0C */	ble lbl_802C51D0
 /* 802C51C8 002C2108  7F C3 F3 78 */	mr r3, r30
-/* 802C51CC 002C210C  48 00 9B 71 */	bl __dl
+/* 802C51CC 002C210C  48 00 9B 71 */	bl __dl__FPv
 lbl_802C51D0:
 /* 802C51D0 002C2110  7F C3 F3 78 */	mr r3, r30
 /* 802C51D4 002C2114  83 E1 00 0C */	lwz r31, 0xc(r1)
diff --git a/asm/Z2AudioLib/Z2SeMgr.s b/asm/Z2AudioLib/Z2SeMgr.s
index cf9da172f3..91a48e2eab 100644
--- a/asm/Z2AudioLib/Z2SeMgr.s
+++ b/asm/Z2AudioLib/Z2SeMgr.s
@@ -3785,7 +3785,7 @@ Z2MultiSeMgr_NS_dtor:
 /* 802AEB48 002ABA88  41 82 00 10 */	beq lbl_802AEB58
 /* 802AEB4C 002ABA8C  7C 80 07 35 */	extsh. r0, r4
 /* 802AEB50 002ABA90  40 81 00 08 */	ble lbl_802AEB58
-/* 802AEB54 002ABA94  48 02 01 E9 */	bl __dl
+/* 802AEB54 002ABA94  48 02 01 E9 */	bl __dl__FPv
 lbl_802AEB58:
 /* 802AEB58 002ABA98  7F E3 FB 78 */	mr r3, r31
 /* 802AEB5C 002ABA9C  83 E1 00 0C */	lwz r31, 0xc(r1)
diff --git a/asm/Z2AudioLib/Z2SoundHandles.s b/asm/Z2AudioLib/Z2SoundHandles.s
index 6268a5e149..33ae5a9c6d 100644
--- a/asm/Z2AudioLib/Z2SoundHandles.s
+++ b/asm/Z2AudioLib/Z2SoundHandles.s
@@ -10,7 +10,7 @@ Z2SoundHandles:
 /* 802AB084 002A7FC4  90 01 00 14 */	stw r0, 0x14(r1)
 /* 802AB088 002A7FC8  93 E1 00 0C */	stw r31, 0xc(r1)
 /* 802AB08C 002A7FCC  7C 7F 1B 78 */	mr r31, r3
-/* 802AB090 002A7FD0  48 03 0E 85 */	bl JSUPtrList_NS_initiate
+/* 802AB090 002A7FD0  48 03 0E 85 */	bl initiate__10JSUPtrListFv
 /* 802AB094 002A7FD4  38 00 00 00 */	li r0, 0
 /* 802AB098 002A7FD8  98 1F 00 0C */	stb r0, 0xc(r31)
 /* 802AB09C 002A7FDC  7F E3 FB 78 */	mr r3, r31
@@ -35,12 +35,12 @@ Z2SoundHandles_NS_dtor:
 /* 802AB0DC 002A801C  41 82 00 10 */	beq lbl_802AB0EC
 /* 802AB0E0 002A8020  7F C3 F3 78 */	mr r3, r30
 /* 802AB0E4 002A8024  38 80 00 00 */	li r4, 0
-/* 802AB0E8 002A8028  48 03 0D C5 */	bl JSUPtrList_NS_dtor
+/* 802AB0E8 002A8028  48 03 0D C5 */	bl __dt__10JSUPtrListFv
 lbl_802AB0EC:
 /* 802AB0EC 002A802C  7F E0 07 35 */	extsh. r0, r31
 /* 802AB0F0 002A8030  40 81 00 0C */	ble lbl_802AB0FC
 /* 802AB0F4 002A8034  7F C3 F3 78 */	mr r3, r30
-/* 802AB0F8 002A8038  48 02 3C 45 */	bl __dl
+/* 802AB0F8 002A8038  48 02 3C 45 */	bl __dl__FPv
 lbl_802AB0FC:
 /* 802AB0FC 002A803C  7F C3 F3 78 */	mr r3, r30
 /* 802AB100 002A8040  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -72,14 +72,14 @@ lbl_802AB13C:
 /* 802AB14C 002A808C  38 9E 00 04 */	addi r4, r30, 4
 lbl_802AB150:
 /* 802AB150 002A8090  7F E3 FB 78 */	mr r3, r31
-/* 802AB154 002A8094  48 03 10 09 */	bl JSUPtrList_NS_remove
+/* 802AB154 002A8094  48 03 10 09 */	bl remove__10JSUPtrListFP10JSUPtrLink
 /* 802AB158 002A8098  28 1E 00 00 */	cmplwi r30, 0
 /* 802AB15C 002A809C  41 82 00 78 */	beq lbl_802AB1D4
 /* 802AB160 002A80A0  34 1E 00 04 */	addic. r0, r30, 4
 /* 802AB164 002A80A4  41 82 00 10 */	beq lbl_802AB174
 /* 802AB168 002A80A8  38 7E 00 04 */	addi r3, r30, 4
 /* 802AB16C 002A80AC  38 80 00 00 */	li r4, 0
-/* 802AB170 002A80B0  48 03 0C A5 */	bl JSUPtrLink_NS_dtor
+/* 802AB170 002A80B0  48 03 0C A5 */	bl __dt__10JSUPtrLinkFv
 lbl_802AB174:
 /* 802AB174 002A80B4  28 1E 00 00 */	cmplwi r30, 0
 /* 802AB178 002A80B8  41 82 00 0C */	beq lbl_802AB184
@@ -136,7 +136,7 @@ JASMemPool_NS_dtor_X4_:
 /* 802AB228 002A8168  7F E0 07 35 */	extsh. r0, r31
 /* 802AB22C 002A816C  40 81 00 0C */	ble lbl_802AB238
 /* 802AB230 002A8170  7F C3 F3 78 */	mr r3, r30
-/* 802AB234 002A8174  48 02 3B 09 */	bl __dl
+/* 802AB234 002A8174  48 02 3B 09 */	bl __dl__FPv
 lbl_802AB238:
 /* 802AB238 002A8178  7F C3 F3 78 */	mr r3, r30
 /* 802AB23C 002A817C  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -245,7 +245,7 @@ lbl_802AB364:
 /* 802AB380 002A82C0  90 03 00 00 */	stw r0, 0(r3)
 /* 802AB384 002A82C4  7C 64 1B 78 */	mr r4, r3
 /* 802AB388 002A82C8  38 64 00 04 */	addi r3, r4, 4
-/* 802AB38C 002A82CC  48 03 0A 71 */	bl JSUPtrLink
+/* 802AB38C 002A82CC  48 03 0A 71 */	bl __ct__10JSUPtrLinkFPv
 lbl_802AB390:
 /* 802AB390 002A82D0  28 1E 00 00 */	cmplwi r30, 0
 /* 802AB394 002A82D4  41 82 00 20 */	beq lbl_802AB3B4
@@ -254,7 +254,7 @@ lbl_802AB390:
 /* 802AB3A0 002A82E0  38 9E 00 04 */	addi r4, r30, 4
 lbl_802AB3A4:
 /* 802AB3A4 002A82E4  7F E3 FB 78 */	mr r3, r31
-/* 802AB3A8 002A82E8  48 03 0B A5 */	bl JSUPtrList_NS_append
+/* 802AB3A8 002A82E8  48 03 0B A5 */	bl append__10JSUPtrListFP10JSUPtrLink
 /* 802AB3AC 002A82EC  7F C3 F3 78 */	mr r3, r30
 /* 802AB3B0 002A82F0  48 00 00 08 */	b lbl_802AB3B8
 lbl_802AB3B4:
@@ -411,14 +411,14 @@ lbl_802AB594:
 /* 802AB5A0 002A84E0  38 9F 00 04 */	addi r4, r31, 4
 lbl_802AB5A4:
 /* 802AB5A4 002A84E4  7F 83 E3 78 */	mr r3, r28
-/* 802AB5A8 002A84E8  48 03 0B B5 */	bl JSUPtrList_NS_remove
+/* 802AB5A8 002A84E8  48 03 0B B5 */	bl remove__10JSUPtrListFP10JSUPtrLink
 /* 802AB5AC 002A84EC  28 1F 00 00 */	cmplwi r31, 0
 /* 802AB5B0 002A84F0  41 82 00 78 */	beq lbl_802AB628
 /* 802AB5B4 002A84F4  34 1F 00 04 */	addic. r0, r31, 4
 /* 802AB5B8 002A84F8  41 82 00 10 */	beq lbl_802AB5C8
 /* 802AB5BC 002A84FC  38 7F 00 04 */	addi r3, r31, 4
 /* 802AB5C0 002A8500  38 80 00 00 */	li r4, 0
-/* 802AB5C4 002A8504  48 03 08 51 */	bl JSUPtrLink_NS_dtor
+/* 802AB5C4 002A8504  48 03 08 51 */	bl __dt__10JSUPtrLinkFv
 lbl_802AB5C8:
 /* 802AB5C8 002A8508  28 1F 00 00 */	cmplwi r31, 0
 /* 802AB5CC 002A850C  41 82 00 0C */	beq lbl_802AB5D8
diff --git a/asm/Z2AudioLib/Z2SoundInfo.s b/asm/Z2AudioLib/Z2SoundInfo.s
index c471df397c..33e2d843f1 100644
--- a/asm/Z2AudioLib/Z2SoundInfo.s
+++ b/asm/Z2AudioLib/Z2SoundInfo.s
@@ -898,7 +898,7 @@ lbl_802BBC84:
 /* 802BBC90 002B8BD0  7F E0 07 35 */	extsh. r0, r31
 /* 802BBC94 002B8BD4  40 81 00 0C */	ble lbl_802BBCA0
 /* 802BBC98 002B8BD8  7F C3 F3 78 */	mr r3, r30
-/* 802BBC9C 002B8BDC  48 01 30 A1 */	bl __dl
+/* 802BBC9C 002B8BDC  48 01 30 A1 */	bl __dl__FPv
 lbl_802BBCA0:
 /* 802BBCA0 002B8BE0  7F C3 F3 78 */	mr r3, r30
 /* 802BBCA4 002B8BE4  83 E1 00 0C */	lwz r31, 0xc(r1)
diff --git a/asm/Z2AudioLib/Z2SoundObjMgr.s b/asm/Z2AudioLib/Z2SoundObjMgr.s
index 628b80e4b3..8ca400135e 100644
--- a/asm/Z2AudioLib/Z2SoundObjMgr.s
+++ b/asm/Z2AudioLib/Z2SoundObjMgr.s
@@ -11,7 +11,7 @@ Z2SoundObjMgr:
 /* 802BF92C 002BC86C  93 E1 00 0C */	stw r31, 0xc(r1)
 /* 802BF930 002BC870  7C 7F 1B 78 */	mr r31, r3
 /* 802BF934 002BC874  93 ED 85 C8 */	stw r31, lbl_80450B48-_SDA_BASE_(r13)
-/* 802BF938 002BC878  48 01 C5 DD */	bl JSUPtrList_NS_initiate
+/* 802BF938 002BC878  48 01 C5 DD */	bl initiate__10JSUPtrListFv
 /* 802BF93C 002BC87C  38 00 00 00 */	li r0, 0
 /* 802BF940 002BC880  98 1F 00 19 */	stb r0, 0x19(r31)
 /* 802BF944 002BC884  98 1F 00 1B */	stb r0, 0x1b(r31)
@@ -550,7 +550,7 @@ lbl_802C00A8:
 /* 802C00BC 002BCFFC  40 82 00 18 */	bne lbl_802C00D4
 /* 802C00C0 002BD000  7F 63 DB 78 */	mr r3, r27
 /* 802C00C4 002BD004  7F A4 EB 78 */	mr r4, r29
-/* 802C00C8 002BD008  48 01 BE 85 */	bl JSUPtrList_NS_append
+/* 802C00C8 002BD008  48 01 BE 85 */	bl append__10JSUPtrListFP10JSUPtrLink
 /* 802C00CC 002BD00C  7F C3 F3 78 */	mr r3, r30
 /* 802C00D0 002BD010  48 00 00 18 */	b lbl_802C00E8
 lbl_802C00D4:
@@ -636,7 +636,7 @@ lbl_802C01AC:
 /* 802C01C8 002BD108  38 05 FF FF */	addi r0, r5, -1
 /* 802C01CC 002BD10C  98 03 00 18 */	stb r0, 0x18(r3)
 lbl_802C01D0:
-/* 802C01D0 002BD110  48 01 BF 8D */	bl JSUPtrList_NS_remove
+/* 802C01D0 002BD110  48 01 BF 8D */	bl remove__10JSUPtrListFP10JSUPtrLink
 lbl_802C01D4:
 /* 802C01D4 002BD114  80 01 00 14 */	lwz r0, 0x14(r1)
 /* 802C01D8 002BD118  7C 08 03 A6 */	mtlr r0
diff --git a/asm/Z2AudioLib/Z2SoundObject.s b/asm/Z2AudioLib/Z2SoundObject.s
index 6f5af8d859..dfd9f8cfe6 100644
--- a/asm/Z2AudioLib/Z2SoundObject.s
+++ b/asm/Z2AudioLib/Z2SoundObject.s
@@ -48,7 +48,7 @@ Z2SoundObjBase_NS_dtor:
 /* 802BDF84 002BAEC4  7F E0 07 35 */	extsh. r0, r31
 /* 802BDF88 002BAEC8  40 81 00 0C */	ble lbl_802BDF94
 /* 802BDF8C 002BAECC  7F C3 F3 78 */	mr r3, r30
-/* 802BDF90 002BAED0  48 01 0D AD */	bl __dl
+/* 802BDF90 002BAED0  48 01 0D AD */	bl __dl__FPv
 lbl_802BDF94:
 /* 802BDF94 002BAED4  7F C3 F3 78 */	mr r3, r30
 /* 802BDF98 002BAED8  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -527,7 +527,7 @@ Z2DopplerSoundObjBase:
 /* 802BE630 002BB570  7F E0 07 35 */	extsh. r0, r31
 /* 802BE634 002BB574  40 81 00 0C */	ble lbl_802BE640
 /* 802BE638 002BB578  7F C3 F3 78 */	mr r3, r30
-/* 802BE63C 002BB57C  48 01 07 01 */	bl __dl
+/* 802BE63C 002BB57C  48 01 07 01 */	bl __dl__FPv
 lbl_802BE640:
 /* 802BE640 002BB580  7F C3 F3 78 */	mr r3, r30
 /* 802BE644 002BB584  83 E1 00 0C */	lwz r31, 0xc(r1)
@@ -1025,7 +1025,7 @@ Z2SoundObjAnime_NS_ageSounds_:
 lbl_802BED88:
 /* 802BED88 002BBCC8  7F E3 FB 78 */	mr r3, r31
 /* 802BED8C 002BBCCC  7F C4 F3 78 */	mr r4, r30
-/* 802BED90 002BBCD0  48 01 D4 7D */	bl JSUPtrList_NS_getNthLink
+/* 802BED90 002BBCD0  48 01 D4 7D */	bl getNthLink__10JSUPtrListCFUl
 /* 802BED94 002BBCD4  28 03 00 00 */	cmplwi r3, 0
 /* 802BED98 002BBCD8  41 82 00 08 */	beq lbl_802BEDA0
 /* 802BED9C 002BBCDC  38 63 FF FC */	addi r3, r3, -4
@@ -1035,7 +1035,7 @@ lbl_802BEDA0:
 /* 802BEDA8 002BBCE8  41 82 01 04 */	beq lbl_802BEEAC
 /* 802BEDAC 002BBCEC  7F E3 FB 78 */	mr r3, r31
 /* 802BEDB0 002BBCF0  7F C4 F3 78 */	mr r4, r30
-/* 802BEDB4 002BBCF4  48 01 D4 59 */	bl JSUPtrList_NS_getNthLink
+/* 802BEDB4 002BBCF4  48 01 D4 59 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BEDB8 002BBCF8  28 03 00 00 */	cmplwi r3, 0
 /* 802BEDBC 002BBCFC  41 82 00 08 */	beq lbl_802BEDC4
 /* 802BEDC0 002BBD00  38 63 FF FC */	addi r3, r3, -4
@@ -1051,7 +1051,7 @@ lbl_802BEDC4:
 lbl_802BEDE4:
 /* 802BEDE4 002BBD24  7F E3 FB 78 */	mr r3, r31
 /* 802BEDE8 002BBD28  7F C4 F3 78 */	mr r4, r30
-/* 802BEDEC 002BBD2C  48 01 D4 21 */	bl JSUPtrList_NS_getNthLink
+/* 802BEDEC 002BBD2C  48 01 D4 21 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BEDF0 002BBD30  28 03 00 00 */	cmplwi r3, 0
 /* 802BEDF4 002BBD34  41 82 00 08 */	beq lbl_802BEDFC
 /* 802BEDF8 002BBD38  38 63 FF FC */	addi r3, r3, -4
@@ -1062,7 +1062,7 @@ lbl_802BEDFC:
 /* 802BEE08 002BBD48  41 82 00 28 */	beq lbl_802BEE30
 /* 802BEE0C 002BBD4C  7F E3 FB 78 */	mr r3, r31
 /* 802BEE10 002BBD50  7F C4 F3 78 */	mr r4, r30
-/* 802BEE14 002BBD54  48 01 D3 F9 */	bl JSUPtrList_NS_getNthLink
+/* 802BEE14 002BBD54  48 01 D3 F9 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BEE18 002BBD58  28 03 00 00 */	cmplwi r3, 0
 /* 802BEE1C 002BBD5C  41 82 00 08 */	beq lbl_802BEE24
 /* 802BEE20 002BBD60  38 63 FF FC */	addi r3, r3, -4
@@ -1073,7 +1073,7 @@ lbl_802BEE24:
 lbl_802BEE30:
 /* 802BEE30 002BBD70  7F E3 FB 78 */	mr r3, r31
 /* 802BEE34 002BBD74  7F C4 F3 78 */	mr r4, r30
-/* 802BEE38 002BBD78  48 01 D3 D5 */	bl JSUPtrList_NS_getNthLink
+/* 802BEE38 002BBD78  48 01 D3 D5 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BEE3C 002BBD7C  28 03 00 00 */	cmplwi r3, 0
 /* 802BEE40 002BBD80  41 82 00 08 */	beq lbl_802BEE48
 /* 802BEE44 002BBD84  38 63 FF FC */	addi r3, r3, -4
@@ -1085,7 +1085,7 @@ lbl_802BEE48:
 /* 802BEE58 002BBD98  41 82 00 28 */	beq lbl_802BEE80
 /* 802BEE5C 002BBD9C  7F E3 FB 78 */	mr r3, r31
 /* 802BEE60 002BBDA0  7F C4 F3 78 */	mr r4, r30
-/* 802BEE64 002BBDA4  48 01 D3 A9 */	bl JSUPtrList_NS_getNthLink
+/* 802BEE64 002BBDA4  48 01 D3 A9 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BEE68 002BBDA8  28 03 00 00 */	cmplwi r3, 0
 /* 802BEE6C 002BBDAC  41 82 00 08 */	beq lbl_802BEE74
 /* 802BEE70 002BBDB0  38 63 FF FC */	addi r3, r3, -4
@@ -1096,7 +1096,7 @@ lbl_802BEE74:
 lbl_802BEE80:
 /* 802BEE80 002BBDC0  7F E3 FB 78 */	mr r3, r31
 /* 802BEE84 002BBDC4  7F C4 F3 78 */	mr r4, r30
-/* 802BEE88 002BBDC8  48 01 D3 85 */	bl JSUPtrList_NS_getNthLink
+/* 802BEE88 002BBDC8  48 01 D3 85 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BEE8C 002BBDCC  28 03 00 00 */	cmplwi r3, 0
 /* 802BEE90 002BBDD0  41 82 00 08 */	beq lbl_802BEE98
 /* 802BEE94 002BBDD4  38 63 FF FC */	addi r3, r3, -4
@@ -1138,7 +1138,7 @@ Z2SoundObjAnime_NS_updateAnime:
 lbl_802BEF0C:
 /* 802BEF0C 002BBE4C  7F E3 FB 78 */	mr r3, r31
 /* 802BEF10 002BBE50  7F C4 F3 78 */	mr r4, r30
-/* 802BEF14 002BBE54  48 01 D2 F9 */	bl JSUPtrList_NS_getNthLink
+/* 802BEF14 002BBE54  48 01 D2 F9 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BEF18 002BBE58  28 03 00 00 */	cmplwi r3, 0
 /* 802BEF1C 002BBE5C  41 82 00 08 */	beq lbl_802BEF24
 /* 802BEF20 002BBE60  38 63 FF FC */	addi r3, r3, -4
@@ -1148,7 +1148,7 @@ lbl_802BEF24:
 /* 802BEF2C 002BBE6C  41 82 00 70 */	beq lbl_802BEF9C
 /* 802BEF30 002BBE70  7F E3 FB 78 */	mr r3, r31
 /* 802BEF34 002BBE74  7F C4 F3 78 */	mr r4, r30
-/* 802BEF38 002BBE78  48 01 D2 D5 */	bl JSUPtrList_NS_getNthLink
+/* 802BEF38 002BBE78  48 01 D2 D5 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BEF3C 002BBE7C  28 03 00 00 */	cmplwi r3, 0
 /* 802BEF40 002BBE80  41 82 00 08 */	beq lbl_802BEF48
 /* 802BEF44 002BBE84  38 63 FF FC */	addi r3, r3, -4
@@ -1160,7 +1160,7 @@ lbl_802BEF48:
 /* 802BEF58 002BBE98  83 BF 00 18 */	lwz r29, 0x18(r31)
 /* 802BEF5C 002BBE9C  7F E3 FB 78 */	mr r3, r31
 /* 802BEF60 002BBEA0  7F C4 F3 78 */	mr r4, r30
-/* 802BEF64 002BBEA4  48 01 D2 A9 */	bl JSUPtrList_NS_getNthLink
+/* 802BEF64 002BBEA4  48 01 D2 A9 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BEF68 002BBEA8  28 03 00 00 */	cmplwi r3, 0
 /* 802BEF6C 002BBEAC  41 82 00 08 */	beq lbl_802BEF74
 /* 802BEF70 002BBEB0  38 63 FF FC */	addi r3, r3, -4
@@ -1450,7 +1450,7 @@ Z2SoundObjAnime_NS_updateSoundLifeTime_:
 lbl_802BF348:
 /* 802BF348 002BC288  7F E3 FB 78 */	mr r3, r31
 /* 802BF34C 002BC28C  7F C4 F3 78 */	mr r4, r30
-/* 802BF350 002BC290  48 01 CE BD */	bl JSUPtrList_NS_getNthLink
+/* 802BF350 002BC290  48 01 CE BD */	bl getNthLink__10JSUPtrListCFUl
 /* 802BF354 002BC294  28 03 00 00 */	cmplwi r3, 0
 /* 802BF358 002BC298  41 82 00 08 */	beq lbl_802BF360
 /* 802BF35C 002BC29C  38 63 FF FC */	addi r3, r3, -4
@@ -1460,7 +1460,7 @@ lbl_802BF360:
 /* 802BF368 002BC2A8  41 82 02 C0 */	beq lbl_802BF628
 /* 802BF36C 002BC2AC  7F E3 FB 78 */	mr r3, r31
 /* 802BF370 002BC2B0  7F C4 F3 78 */	mr r4, r30
-/* 802BF374 002BC2B4  48 01 CE 99 */	bl JSUPtrList_NS_getNthLink
+/* 802BF374 002BC2B4  48 01 CE 99 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BF378 002BC2B8  28 03 00 00 */	cmplwi r3, 0
 /* 802BF37C 002BC2BC  41 82 00 08 */	beq lbl_802BF384
 /* 802BF380 002BC2C0  38 63 FF FC */	addi r3, r3, -4
@@ -1476,7 +1476,7 @@ lbl_802BF384:
 lbl_802BF3A4:
 /* 802BF3A4 002BC2E4  7F E3 FB 78 */	mr r3, r31
 /* 802BF3A8 002BC2E8  7F C4 F3 78 */	mr r4, r30
-/* 802BF3AC 002BC2EC  48 01 CE 61 */	bl JSUPtrList_NS_getNthLink
+/* 802BF3AC 002BC2EC  48 01 CE 61 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BF3B0 002BC2F0  28 03 00 00 */	cmplwi r3, 0
 /* 802BF3B4 002BC2F4  41 82 00 08 */	beq lbl_802BF3BC
 /* 802BF3B8 002BC2F8  38 63 FF FC */	addi r3, r3, -4
@@ -1499,7 +1499,7 @@ lbl_802BF3E4:
 /* 802BF3F4 002BC334  41 82 00 34 */	beq lbl_802BF428
 /* 802BF3F8 002BC338  7F E3 FB 78 */	mr r3, r31
 /* 802BF3FC 002BC33C  7F C4 F3 78 */	mr r4, r30
-/* 802BF400 002BC340  48 01 CE 0D */	bl JSUPtrList_NS_getNthLink
+/* 802BF400 002BC340  48 01 CE 0D */	bl getNthLink__10JSUPtrListCFUl
 /* 802BF404 002BC344  28 03 00 00 */	cmplwi r3, 0
 /* 802BF408 002BC348  41 82 00 08 */	beq lbl_802BF410
 /* 802BF40C 002BC34C  38 63 FF FC */	addi r3, r3, -4
@@ -1542,7 +1542,7 @@ lbl_802BF484:
 /* 802BF488 002BC3C8  41 82 00 64 */	beq lbl_802BF4EC
 /* 802BF48C 002BC3CC  7F E3 FB 78 */	mr r3, r31
 /* 802BF490 002BC3D0  7F C4 F3 78 */	mr r4, r30
-/* 802BF494 002BC3D4  48 01 CD 79 */	bl JSUPtrList_NS_getNthLink
+/* 802BF494 002BC3D4  48 01 CD 79 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BF498 002BC3D8  28 03 00 00 */	cmplwi r3, 0
 /* 802BF49C 002BC3DC  41 82 00 08 */	beq lbl_802BF4A4
 /* 802BF4A0 002BC3E0  38 63 FF FC */	addi r3, r3, -4
@@ -1556,7 +1556,7 @@ lbl_802BF4A4:
 lbl_802BF4BC:
 /* 802BF4BC 002BC3FC  7F E3 FB 78 */	mr r3, r31
 /* 802BF4C0 002BC400  7F C4 F3 78 */	mr r4, r30
-/* 802BF4C4 002BC404  48 01 CD 49 */	bl JSUPtrList_NS_getNthLink
+/* 802BF4C4 002BC404  48 01 CD 49 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BF4C8 002BC408  28 03 00 00 */	cmplwi r3, 0
 /* 802BF4CC 002BC40C  41 82 00 08 */	beq lbl_802BF4D4
 /* 802BF4D0 002BC410  38 63 FF FC */	addi r3, r3, -4
@@ -1570,7 +1570,7 @@ lbl_802BF4D4:
 lbl_802BF4EC:
 /* 802BF4EC 002BC42C  7F E3 FB 78 */	mr r3, r31
 /* 802BF4F0 002BC430  7F C4 F3 78 */	mr r4, r30
-/* 802BF4F4 002BC434  48 01 CD 19 */	bl JSUPtrList_NS_getNthLink
+/* 802BF4F4 002BC434  48 01 CD 19 */	bl getNthLink__10JSUPtrListCFUl
 /* 802BF4F8 002BC438  28 03 00 00 */	cmplwi r3, 0
 /* 802BF4FC 002BC43C  41 82 00 08 */	beq lbl_802BF504
 /* 802BF500 002BC440  38 63 FF FC */	addi r3, r3, -4
@@ -1583,7 +1583,7 @@ lbl_802BF510:
 /* 802BF514 002BC454  41 82 00 28 */	beq lbl_802BF53C
 /* 802BF518 002BC458  7F E3 FB 78 */	mr r3, r31
 /* 802BF51C 002BC45C  7F C4 F3 78 */	mr r4, r30
-/* 802BF520 002BC460  48 01 CC ED */	bl JSUPtrList_NS_getNthLink
+/* 802BF520 002BC460  48 01 CC ED */	bl getNthLink__10JSUPtrListCFUl
 /* 802BF524 002BC464  28 03 00 00 */	cmplwi r3, 0
 /* 802BF528 002BC468  41 82 00 08 */	beq lbl_802BF530
 /* 802BF52C 002BC46C  38 63 FF FC */	addi r3, r3, -4
@@ -1653,7 +1653,7 @@ lbl_802BF600:
 /* 802BF604 002BC544  41 82 00 24 */	beq lbl_802BF628
 /* 802BF608 002BC548  7F E3 FB 78 */	mr r3, r31
 /* 802BF60C 002BC54C  7F C4 F3 78 */	mr r4, r30
-/* 802BF610 002BC550  48 01 CB FD */	bl JSUPtrList_NS_getNthLink
+/* 802BF610 002BC550  48 01 CB FD */	bl getNthLink__10JSUPtrListCFUl
 /* 802BF614 002BC554  28 03 00 00 */	cmplwi r3, 0
 /* 802BF618 002BC558  41 82 00 08 */	beq lbl_802BF620
 /* 802BF61C 002BC55C  38 63 FF FC */	addi r3, r3, -4
diff --git a/asm/Z2AudioLib/Z2SoundStarter.s b/asm/Z2AudioLib/Z2SoundStarter.s
index fd40c173f7..197daac99f 100644
--- a/asm/Z2AudioLib/Z2SoundStarter.s
+++ b/asm/Z2AudioLib/Z2SoundStarter.s
@@ -345,7 +345,7 @@ lbl_802AB044:
 /* 802AB050 002A7F90  7F E0 07 35 */	extsh. r0, r31
 /* 802AB054 002A7F94  40 81 00 0C */	ble lbl_802AB060
 /* 802AB058 002A7F98  7F C3 F3 78 */	mr r3, r30
-/* 802AB05C 002A7F9C  48 02 3C E1 */	bl __dl
+/* 802AB05C 002A7F9C  48 02 3C E1 */	bl __dl__FPv
 lbl_802AB060:
 /* 802AB060 002A7FA0  7F C3 F3 78 */	mr r3, r30
 /* 802AB064 002A7FA4  83 E1 00 0C */	lwz r31, 0xc(r1)
diff --git a/asm/Z2AudioLib/Z2SpeechMgr2.s b/asm/Z2AudioLib/Z2SpeechMgr2.s
index 3f575a411c..1488f19e6c 100644
--- a/asm/Z2AudioLib/Z2SpeechMgr2.s
+++ b/asm/Z2AudioLib/Z2SpeechMgr2.s
@@ -75,7 +75,7 @@ lbl_802CBD5C:
 /* 802CBD5C 002C8C9C  7F E0 07 35 */	extsh. r0, r31
 /* 802CBD60 002C8CA0  40 81 00 0C */	ble lbl_802CBD6C
 /* 802CBD64 002C8CA4  7F C3 F3 78 */	mr r3, r30
-/* 802CBD68 002C8CA8  48 00 2F D5 */	bl __dl
+/* 802CBD68 002C8CA8  48 00 2F D5 */	bl __dl__FPv
 lbl_802CBD6C:
 /* 802CBD6C 002C8CAC  7F C3 F3 78 */	mr r3, r30
 /* 802CBD70 002C8CB0  83 E1 00 0C */	lwz r31, 0xc(r1)