label __nwa__FUl and __dla__FPv

18 files changed, 61 insertions, 57 deletions

diff --git a/asm/code_8000AAC4.s b/asm/code_8000AAC4.s
index 8b7cdbf..4f3a0e4 100644
--- a/asm/code_8000AAC4.s
+++ b/asm/code_8000AAC4.s
@@ -98,7 +98,7 @@ func_8000AB6C:
 /* 8000ABAC 0000680C  83 E4 00 00 */	lwz r31, 0(r4)
 /* 8000ABB0 00006810  57 E3 18 38 */	slwi r3, r31, 3
 /* 8000ABB4 00006814  38 63 00 10 */	addi r3, r3, 0x10
-/* 8000ABB8 00006818  48 1C FE BD */	bl func_801DAA74
+/* 8000ABB8 00006818  48 1C FE BD */	bl __nwa__FUl
 /* 8000ABBC 0000681C  3C 80 80 01 */	lis r4, lbl_8000AC34@ha
 /* 8000ABC0 00006820  7F E7 FB 78 */	mr r7, r31
 /* 8000ABC4 00006824  38 84 AC 34 */	addi r4, r4, lbl_8000AC34@l
diff --git a/asm/code_80025390.s b/asm/code_80025390.s
index cf77f5e..6892d3b 100644
--- a/asm/code_80025390.s
+++ b/asm/code_80025390.s
@@ -31,7 +31,7 @@ func_80025390:
 /* 800253F0 00021050  90 83 00 08 */	stw r4, 8(r3)
 /* 800253F4 00021054  90 03 00 00 */	stw r0, 0(r3)
 /* 800253F8 00021058  38 60 01 10 */	li r3, 0x110
-/* 800253FC 0002105C  48 1B 56 79 */	bl func_801DAA74
+/* 800253FC 0002105C  48 1B 56 79 */	bl __nwa__FUl
 /* 80025400 00021060  3C 80 80 02 */	lis r4, func_80025478@ha
 /* 80025404 00021064  38 A0 00 00 */	li r5, 0
 /* 80025408 00021068  38 84 54 78 */	addi r4, r4, func_80025478@l
diff --git a/asm/code_800478C0.s b/asm/code_800478C0.s
index baed81c..96017db 100644
--- a/asm/code_800478C0.s
+++ b/asm/code_800478C0.s
@@ -86,7 +86,7 @@ lbl_800479C4:
 /* 800479C8 00043628  90 1E 00 08 */	stw r0, 8(r30)

 /* 800479CC 0004362C  1C 7F 00 24 */	mulli r3, r31, 0x24

 /* 800479D0 00043630  38 63 00 10 */	addi r3, r3, 0x10

-/* 800479D4 00043634  48 19 30 A1 */	bl func_801DAA74

+/* 800479D4 00043634  48 19 30 A1 */	bl __nwa__FUl

 /* 800479D8 00043638  3C 80 80 04 */	lis r4, lbl_800478C0@ha

 /* 800479DC 0004363C  7F E7 FB 78 */	mr r7, r31

 /* 800479E0 00043640  38 84 78 C0 */	addi r4, r4, lbl_800478C0@l

@@ -96,7 +96,7 @@ lbl_800479C4:
 /* 800479F0 00043650  80 1E 00 08 */	lwz r0, 8(r30)

 /* 800479F4 00043654  90 7E 00 2C */	stw r3, 0x2c(r30)

 /* 800479F8 00043658  54 03 10 3A */	slwi r3, r0, 2

-/* 800479FC 0004365C  48 19 30 79 */	bl func_801DAA74

+/* 800479FC 0004365C  48 19 30 79 */	bl __nwa__FUl

 /* 80047A00 00043660  90 7E 00 30 */	stw r3, 0x30(r30)

 /* 80047A04 00043664  38 C0 00 00 */	li r6, 0

 /* 80047A08 00043668  38 A0 00 00 */	li r5, 0

@@ -167,7 +167,7 @@ func_80047AA8:
 /* 80047AD8 00043738  41 82 00 18 */	beq lbl_80047AF0

 /* 80047ADC 0004373C  41 82 00 0C */	beq lbl_80047AE8

 /* 80047AE0 00043740  38 64 FF F0 */	addi r3, r4, -16

-/* 80047AE4 00043744  48 19 2F D9 */	bl func_801DAABC

+/* 80047AE4 00043744  48 19 2F D9 */	bl __dla__FPv

 lbl_80047AE8:

 /* 80047AE8 00043748  38 00 00 00 */	li r0, 0

 /* 80047AEC 0004374C  90 1D 00 2C */	stw r0, 0x2c(r29)

@@ -196,7 +196,7 @@ lbl_80047B34:
 /* 80047B38 00043798  7C 1E 00 40 */	cmplw r30, r0

 /* 80047B3C 0004379C  41 80 FF CC */	blt lbl_80047B08

 /* 80047B40 000437A0  80 7D 00 30 */	lwz r3, 0x30(r29)

-/* 80047B44 000437A4  48 19 2F 79 */	bl func_801DAABC

+/* 80047B44 000437A4  48 19 2F 79 */	bl __dla__FPv

 /* 80047B48 000437A8  38 00 00 00 */	li r0, 0

 /* 80047B4C 000437AC  90 1D 00 30 */	stw r0, 0x30(r29)

 lbl_80047B50:

diff --git a/asm/code_8009A2BC.s b/asm/code_8009A2BC.s
index c999fae..9186a4f 100644
--- a/asm/code_8009A2BC.s
+++ b/asm/code_8009A2BC.s
@@ -11,7 +11,7 @@ func_8009A2BC:
 /* 8009A2CC 00095F2C  48 12 CE 55 */	bl _savegpr_25

 /* 8009A2D0 00095F30  7C 7A 1B 78 */	mr r26, r3

 /* 8009A2D4 00095F34  38 60 06 90 */	li r3, 0x690

-/* 8009A2D8 00095F38  48 14 07 9D */	bl func_801DAA74

+/* 8009A2D8 00095F38  48 14 07 9D */	bl __nwa__FUl

 /* 8009A2DC 00095F3C  39 40 00 00 */	li r10, 0

 /* 8009A2E0 00095F40  39 20 00 01 */	li r9, 1

 /* 8009A2E4 00095F44  39 00 00 02 */	li r8, 2

@@ -197,7 +197,7 @@ lbl_8009A53C:
 /* 8009A580 000961E0  38 84 00 8C */	addi r4, r4, 0x8c

 /* 8009A584 000961E4  41 80 FF 20 */	blt lbl_8009A4A4

 /* 8009A588 000961E8  7F 83 E3 78 */	mr r3, r28

-/* 8009A58C 000961EC  48 14 05 31 */	bl func_801DAABC

+/* 8009A58C 000961EC  48 14 05 31 */	bl __dla__FPv

 /* 8009A590 000961F0  39 61 00 60 */	addi r11, r1, 0x60

 /* 8009A594 000961F4  48 12 CB D9 */	bl _restgpr_25

 /* 8009A598 000961F8  80 01 00 64 */	lwz r0, 0x64(r1)

diff --git a/asm/code_801708DC.s b/asm/code_801708DC.s
index 5c2c24b..c943e8d 100644
--- a/asm/code_801708DC.s
+++ b/asm/code_801708DC.s
@@ -85,7 +85,7 @@ func_801709B4:
 /* 801709DC 0016C63C  2C 00 00 00 */	cmpwi r0, 0
 /* 801709E0 0016C640  40 82 00 24 */	bne lbl_80170A04
 /* 801709E4 0016C644  38 60 03 80 */	li r3, 0x380
-/* 801709E8 0016C648  48 06 A0 8D */	bl func_801DAA74
+/* 801709E8 0016C648  48 06 A0 8D */	bl __nwa__FUl
 /* 801709EC 0016C64C  90 7E 00 04 */	stw r3, 4(r30)
 /* 801709F0 0016C650  38 80 00 00 */	li r4, 0
 /* 801709F4 0016C654  38 A0 03 80 */	li r5, 0x380
diff --git a/asm/code_80177C24.s b/asm/code_80177C24.s
index 2a24b95..b8b716c 100644
--- a/asm/code_80177C24.s
+++ b/asm/code_80177C24.s
@@ -174,7 +174,7 @@ lbl_80177E5C:
 /* 80177E60 00173AC0  38 60 07 D0 */	li r3, 0x7d0

 /* 80177E64 00173AC4  93 C4 00 BC */	stw r30, 0xbc(r4)

 /* 80177E68 00173AC8  93 E4 00 B8 */	stw r31, 0xb8(r4)

-/* 80177E6C 00173ACC  48 06 2C 09 */	bl func_801DAA74

+/* 80177E6C 00173ACC  48 06 2C 09 */	bl __nwa__FUl

 /* 80177E70 00173AD0  3B 9C 00 01 */	addi r28, r28, 1

 /* 80177E74 00173AD4  7C 9B EA 14 */	add r4, r27, r29

 /* 80177E78 00173AD8  2C 1C 00 04 */	cmpwi r28, 4

@@ -188,12 +188,16 @@ lbl_80177E5C:
 /* 80177E98 00173AF8  7C 08 03 A6 */	mtlr r0

 /* 80177E9C 00173AFC  38 21 00 20 */	addi r1, r1, 0x20

 /* 80177EA0 00173B00  4E 80 00 20 */	blr

+

+# note: constructor

 lbl_80177EA4:

 /* 80177EA4 00173B04  38 00 00 00 */	li r0, 0

 /* 80177EA8 00173B08  90 03 00 04 */	stw r0, 4(r3)

 /* 80177EAC 00173B0C  90 03 00 00 */	stw r0, 0(r3)

 /* 80177EB0 00173B10  90 03 00 08 */	stw r0, 8(r3)

 /* 80177EB4 00173B14  4E 80 00 20 */	blr

+

+# note: destructor

 lbl_80177EB8:

 /* 80177EB8 00173B18  94 21 FF F0 */	stwu r1, -0x10(r1)

 /* 80177EBC 00173B1C  7C 08 02 A6 */	mflr r0

@@ -207,7 +211,7 @@ lbl_80177EB8:
 /* 80177EDC 00173B3C  80 63 00 08 */	lwz r3, 8(r3)

 /* 80177EE0 00173B40  2C 03 00 00 */	cmpwi r3, 0

 /* 80177EE4 00173B44  41 82 00 08 */	beq lbl_80177EEC

-/* 80177EE8 00173B48  48 06 2B D5 */	bl func_801DAABC

+/* 80177EE8 00173B48  48 06 2B D5 */	bl __dla__FPv

 lbl_80177EEC:

 /* 80177EEC 00173B4C  38 00 00 00 */	li r0, 0

 /* 80177EF0 00173B50  2C 1F 00 00 */	cmpwi r31, 0

@@ -550,7 +554,7 @@ lbl_8017838C:
 /* 8017839C 00173FFC  80 63 00 08 */	lwz r3, 8(r3)

 /* 801783A0 00174000  38 03 00 01 */	addi r0, r3, 1

 /* 801783A4 00174004  54 03 10 3A */	slwi r3, r0, 2

-/* 801783A8 00174008  48 06 26 CD */	bl func_801DAA74

+/* 801783A8 00174008  48 06 26 CD */	bl __nwa__FUl

 /* 801783AC 0017400C  1C 1B 00 98 */	mulli r0, r27, 0x98

 /* 801783B0 00174010  80 99 00 AC */	lwz r4, 0xac(r25)

 /* 801783B4 00174014  7C 84 02 14 */	add r4, r4, r0

@@ -599,7 +603,7 @@ lbl_80178430:
 /* 80178448 001740A8  38 80 FF FF */	li r4, -1

 /* 8017844C 001740AC  7C 83 01 2E */	stwx r4, r3, r0

 /* 80178450 001740B0  40 82 00 10 */	bne lbl_80178460

-/* 80178454 001740B4  48 06 26 69 */	bl func_801DAABC

+/* 80178454 001740B4  48 06 26 69 */	bl __dla__FPv

 /* 80178458 001740B8  38 60 FF FF */	li r3, -1

 /* 8017845C 001740BC  48 00 00 20 */	b lbl_8017847C

 lbl_80178460:

@@ -608,7 +612,7 @@ lbl_80178460:
 /* 80178468 001740C8  7C 00 D0 50 */	subf r0, r0, r26

 /* 8017846C 001740CC  54 00 10 3A */	slwi r0, r0, 2

 /* 80178470 001740D0  7F 03 00 2E */	lwzx r24, r3, r0

-/* 80178474 001740D4  48 06 26 49 */	bl func_801DAABC

+/* 80178474 001740D4  48 06 26 49 */	bl __dla__FPv

 /* 80178478 001740D8  7F 03 C3 78 */	mr r3, r24

 lbl_8017847C:

 /* 8017847C 001740DC  39 61 00 30 */	addi r11, r1, 0x30

@@ -2170,7 +2174,7 @@ lbl_80179A4C:
 /* 80179A4C 001756AC  93 17 00 04 */	stw r24, 4(r23)

 /* 80179A50 001756B0  38 60 07 D0 */	li r3, 0x7d0

 /* 80179A54 001756B4  93 F7 00 00 */	stw r31, 0(r23)

-/* 80179A58 001756B8  48 06 10 1D */	bl func_801DAA74

+/* 80179A58 001756B8  48 06 10 1D */	bl __nwa__FUl

 /* 80179A5C 001756BC  3A D6 00 01 */	addi r22, r22, 1

 /* 80179A60 001756C0  90 77 00 08 */	stw r3, 8(r23)

 /* 80179A64 001756C4  2C 16 00 03 */	cmpwi r22, 3

@@ -2297,21 +2301,21 @@ lbl_80179BC0:
 /* 80179C1C 0017587C  80 61 00 2C */	lwz r3, 0x2c(r1)

 /* 80179C20 00175880  2C 03 00 00 */	cmpwi r3, 0

 /* 80179C24 00175884  41 82 00 08 */	beq lbl_80179C2C

-/* 80179C28 00175888  48 06 0E 95 */	bl func_801DAABC

+/* 80179C28 00175888  48 06 0E 95 */	bl __dla__FPv

 lbl_80179C2C:

 /* 80179C2C 0017588C  80 61 00 20 */	lwz r3, 0x20(r1)

 /* 80179C30 00175890  38 00 00 00 */	li r0, 0

 /* 80179C34 00175894  90 01 00 2C */	stw r0, 0x2c(r1)

 /* 80179C38 00175898  2C 03 00 00 */	cmpwi r3, 0

 /* 80179C3C 0017589C  41 82 00 08 */	beq lbl_80179C44

-/* 80179C40 001758A0  48 06 0E 7D */	bl func_801DAABC

+/* 80179C40 001758A0  48 06 0E 7D */	bl __dla__FPv

 lbl_80179C44:

 /* 80179C44 001758A4  80 61 00 14 */	lwz r3, 0x14(r1)

 /* 80179C48 001758A8  38 00 00 00 */	li r0, 0

 /* 80179C4C 001758AC  90 01 00 20 */	stw r0, 0x20(r1)

 /* 80179C50 001758B0  2C 03 00 00 */	cmpwi r3, 0

 /* 80179C54 001758B4  41 82 00 08 */	beq lbl_80179C5C

-/* 80179C58 001758B8  48 06 0E 65 */	bl func_801DAABC

+/* 80179C58 001758B8  48 06 0E 65 */	bl __dla__FPv

 lbl_80179C5C:

 /* 80179C5C 001758BC  38 00 00 00 */	li r0, 0

 /* 80179C60 001758C0  39 61 00 60 */	addi r11, r1, 0x60

@@ -2341,7 +2345,7 @@ func_80179C7C:
 /* 80179CB4 00175914  39 C0 00 01 */	li r14, 1

 /* 80179CB8 00175918  90 01 00 10 */	stw r0, 0x10(r1)

 /* 80179CBC 0017591C  38 60 07 D0 */	li r3, 0x7d0

-/* 80179CC0 00175920  48 06 0D B5 */	bl func_801DAA74

+/* 80179CC0 00175920  48 06 0D B5 */	bl __nwa__FUl

 /* 80179CC4 00175924  90 61 00 18 */	stw r3, 0x18(r1)

 /* 80179CC8 00175928  38 61 00 08 */	addi r3, r1, 8

 /* 80179CCC 0017592C  38 80 00 00 */	li r4, 0

@@ -2366,7 +2370,7 @@ func_80179C7C:
 /* 80179D18 00175978  80 61 00 18 */	lwz r3, 0x18(r1)

 /* 80179D1C 0017597C  2C 03 00 00 */	cmpwi r3, 0

 /* 80179D20 00175980  41 82 00 08 */	beq lbl_80179D28

-/* 80179D24 00175984  48 06 0D 99 */	bl func_801DAABC

+/* 80179D24 00175984  48 06 0D 99 */	bl __dla__FPv

 lbl_80179D28:

 /* 80179D28 00175988  38 00 00 00 */	li r0, 0

 /* 80179D2C 0017598C  38 60 00 00 */	li r3, 0

@@ -2545,7 +2549,7 @@ lbl_80179F78:
 /* 80179F80 00175BE0  80 61 00 18 */	lwz r3, 0x18(r1)

 /* 80179F84 00175BE4  2C 03 00 00 */	cmpwi r3, 0

 /* 80179F88 00175BE8  41 82 00 08 */	beq lbl_80179F90

-/* 80179F8C 00175BEC  48 06 0B 31 */	bl func_801DAABC

+/* 80179F8C 00175BEC  48 06 0B 31 */	bl __dla__FPv

 lbl_80179F90:

 /* 80179F90 00175BF0  38 00 00 00 */	li r0, 0

 /* 80179F94 00175BF4  38 60 00 00 */	li r3, 0

@@ -2579,7 +2583,7 @@ lbl_80179FF4:
 /* 80179FF4 00175C54  80 61 00 18 */	lwz r3, 0x18(r1)

 /* 80179FF8 00175C58  2C 03 00 00 */	cmpwi r3, 0

 /* 80179FFC 00175C5C  41 82 00 08 */	beq lbl_8017A004

-/* 8017A000 00175C60  48 06 0A BD */	bl func_801DAABC

+/* 8017A000 00175C60  48 06 0A BD */	bl __dla__FPv

 lbl_8017A004:

 /* 8017A004 00175C64  38 00 00 00 */	li r0, 0

 /* 8017A008 00175C68  7D C3 73 78 */	mr r3, r14

diff --git a/asm/code_801DAA30.s b/asm/code_801DAA30.s
index 814bd57..05d7f52 100644
--- a/asm/code_801DAA30.s
+++ b/asm/code_801DAA30.s
@@ -24,8 +24,8 @@ lbl_801DAA60:
 /* 801DAA6C 001D66CC  38 21 00 10 */	addi r1, r1, 0x10

 /* 801DAA70 001D66D0  4E 80 00 20 */	blr

 

-.global func_801DAA74

-func_801DAA74:

+.global __nwa__FUl

+__nwa__FUl:

 /* 801DAA74 001D66D4  94 21 FF F0 */	stwu r1, -0x10(r1)

 /* 801DAA78 001D66D8  7C 08 02 A6 */	mflr r0

 /* 801DAA7C 001D66DC  90 01 00 14 */	stw r0, 0x14(r1)

@@ -50,8 +50,8 @@ lbl_801DAAA4:
 __dl__FPv:

 /* 801DAAB8 001D6718  48 00 03 EC */	b func_801DAEA4

 

-.global func_801DAABC

-func_801DAABC:

+.global __dla__FPv

+__dla__FPv:

 /* 801DAABC 001D671C  48 00 03 E8 */	b func_801DAEA4

 

 .global func_801DAAC0

diff --git a/asm/code_801DF040.s b/asm/code_801DF040.s
index 0ebd94b..8dbdccd 100644
--- a/asm/code_801DF040.s
+++ b/asm/code_801DF040.s
@@ -50,7 +50,7 @@ func_801DF040:
 /* 801DF0EC 001DAD4C  41 82 00 4C */	beq lbl_801DF138

 /* 801DF0F0 001DAD50  1C 7D 00 0C */	mulli r3, r29, 0xc

 /* 801DF0F4 001DAD54  38 63 00 10 */	addi r3, r3, 0x10

-/* 801DF0F8 001DAD58  4B FF B9 7D */	bl func_801DAA74

+/* 801DF0F8 001DAD58  4B FF B9 7D */	bl __nwa__FUl

 /* 801DF0FC 001DAD5C  3C 80 80 03 */	lis r4, func_8002A294@ha

 /* 801DF100 001DAD60  7F A7 EB 78 */	mr r7, r29

 /* 801DF104 001DAD64  38 84 A2 94 */	addi r4, r4, func_8002A294@l

@@ -72,7 +72,7 @@ lbl_801DF138:
 /* 801DF140 001DADA0  41 82 00 60 */	beq lbl_801DF1A0

 /* 801DF144 001DADA4  1C 7D 00 0C */	mulli r3, r29, 0xc

 /* 801DF148 001DADA8  38 63 00 10 */	addi r3, r3, 0x10

-/* 801DF14C 001DADAC  4B FF B9 29 */	bl func_801DAA74

+/* 801DF14C 001DADAC  4B FF B9 29 */	bl __nwa__FUl

 /* 801DF150 001DADB0  3C 80 80 03 */	lis r4, func_8002A294@ha

 /* 801DF154 001DADB4  7F A7 EB 78 */	mr r7, r29

 /* 801DF158 001DADB8  38 84 A2 94 */	addi r4, r4, func_8002A294@l

@@ -144,7 +144,7 @@ lbl_801DF1A0:
 /* 801DF258 001DAEB8  41 82 00 10 */	beq lbl_801DF268

 /* 801DF25C 001DAEBC  41 86 00 0C */	beq cr1, lbl_801DF268

 /* 801DF260 001DAEC0  38 64 FF F0 */	addi r3, r4, -16

-/* 801DF264 001DAEC4  4B FF B8 59 */	bl func_801DAABC

+/* 801DF264 001DAEC4  4B FF B8 59 */	bl __dla__FPv

 lbl_801DF268:

 /* 801DF268 001DAEC8  80 9E 01 3C */	lwz r4, 0x13c(r30)

 /* 801DF26C 001DAECC  2C 84 00 00 */	cmpwi cr1, r4, 0

@@ -155,7 +155,7 @@ lbl_801DF268:
 /* 801DF280 001DAEE0  41 82 00 10 */	beq lbl_801DF290

 /* 801DF284 001DAEE4  41 86 00 0C */	beq cr1, lbl_801DF290

 /* 801DF288 001DAEE8  38 64 FF F0 */	addi r3, r4, -16

-/* 801DF28C 001DAEEC  4B FF B8 31 */	bl func_801DAABC

+/* 801DF28C 001DAEEC  4B FF B8 31 */	bl __dla__FPv

 lbl_801DF290:

 /* 801DF290 001DAEF0  7F C3 F3 78 */	mr r3, r30

 /* 801DF294 001DAEF4  38 80 00 00 */	li r4, 0

diff --git a/asm/code_801E6BF8.s b/asm/code_801E6BF8.s
index 29a9484..ad6ef55 100644
--- a/asm/code_801E6BF8.s
+++ b/asm/code_801E6BF8.s
@@ -52,7 +52,7 @@ func_801E6BF8:
 /* 801E6CAC 001E290C  41 82 00 2C */	beq lbl_801E6CD8

 /* 801E6CB0 001E2910  1C 79 00 30 */	mulli r3, r25, 0x30

 /* 801E6CB4 001E2914  38 63 00 10 */	addi r3, r3, 0x10

-/* 801E6CB8 001E2918  4B FF 3D BD */	bl func_801DAA74

+/* 801E6CB8 001E2918  4B FF 3D BD */	bl __nwa__FUl

 /* 801E6CBC 001E291C  3C 80 80 1F */	lis r4, lbl_801ECF20@ha

 /* 801E6CC0 001E2920  7F 27 CB 78 */	mr r7, r25

 /* 801E6CC4 001E2924  38 84 CF 20 */	addi r4, r4, lbl_801ECF20@l

@@ -232,7 +232,7 @@ lbl_801E6F1C:
 /* 801E6F24 001E2B84  41 82 00 10 */	beq lbl_801E6F34

 /* 801E6F28 001E2B88  41 82 00 0C */	beq lbl_801E6F34

 /* 801E6F2C 001E2B8C  38 63 FF F0 */	addi r3, r3, -16

-/* 801E6F30 001E2B90  4B FF 3B 8D */	bl func_801DAABC

+/* 801E6F30 001E2B90  4B FF 3B 8D */	bl __dla__FPv

 lbl_801E6F34:

 /* 801E6F34 001E2B94  7F C3 F3 78 */	mr r3, r30

 /* 801E6F38 001E2B98  38 80 00 00 */	li r4, 0

diff --git a/asm/code_801EE044.s b/asm/code_801EE044.s
index 6521d11..c4e0fec 100644
--- a/asm/code_801EE044.s
+++ b/asm/code_801EE044.s
@@ -1497,7 +1497,7 @@ func_801EF58C:
 /* 801EF5C8 001EB228  41 82 00 60 */	beq lbl_801EF628

 /* 801EF5CC 001EB22C  57 C3 13 BA */	rlwinm r3, r30, 2, 0xe, 0x1d

 /* 801EF5D0 001EB230  38 63 00 10 */	addi r3, r3, 0x10

-/* 801EF5D4 001EB234  4B FE B4 A1 */	bl func_801DAA74

+/* 801EF5D4 001EB234  4B FE B4 A1 */	bl __nwa__FUl

 /* 801EF5D8 001EB238  3C 80 80 03 */	lis r4, func_8002A84C@ha

 /* 801EF5DC 001EB23C  7F C7 F3 78 */	mr r7, r30

 /* 801EF5E0 001EB240  38 84 A8 4C */	addi r4, r4, func_8002A84C@l

@@ -1545,7 +1545,7 @@ func_801EF644:
 /* 801EF678 001EB2D8  54 00 06 F7 */	rlwinm. r0, r0, 0, 0x1b, 0x1b

 /* 801EF67C 001EB2DC  41 82 00 C8 */	beq lbl_801EF744

 /* 801EF680 001EB2E0  57 63 1B 78 */	rlwinm r3, r27, 3, 0xd, 0x1c

-/* 801EF684 001EB2E4  4B FE B3 F1 */	bl func_801DAA74

+/* 801EF684 001EB2E4  4B FE B3 F1 */	bl __nwa__FUl

 /* 801EF688 001EB2E8  2C 03 00 00 */	cmpwi r3, 0

 /* 801EF68C 001EB2EC  7C 7A 1B 78 */	mr r26, r3

 /* 801EF690 001EB2F0  41 82 00 B4 */	beq lbl_801EF744

@@ -1568,7 +1568,7 @@ lbl_801EF6D0:
 /* 801EF6D0 001EB330  A3 99 00 04 */	lhz r28, 4(r25)

 /* 801EF6D4 001EB334  57 83 18 38 */	slwi r3, r28, 3

 /* 801EF6D8 001EB338  38 63 00 10 */	addi r3, r3, 0x10

-/* 801EF6DC 001EB33C  4B FE B3 99 */	bl func_801DAA74

+/* 801EF6DC 001EB33C  4B FE B3 99 */	bl __nwa__FUl

 /* 801EF6E0 001EB340  7F 87 E3 78 */	mr r7, r28

 /* 801EF6E4 001EB344  38 9D A2 98 */	addi r4, r29, -23912

 /* 801EF6E8 001EB348  38 A0 00 00 */	li r5, 0

@@ -2118,7 +2118,7 @@ lbl_801EFE60:
 /* 801EFE70 001EBAD0  2C 03 00 00 */	cmpwi r3, 0

 /* 801EFE74 001EBAD4  41 82 00 0C */	beq lbl_801EFE80

 /* 801EFE78 001EBAD8  38 63 FF F0 */	addi r3, r3, -16

-/* 801EFE7C 001EBADC  4B FE AC 41 */	bl func_801DAABC

+/* 801EFE7C 001EBADC  4B FE AC 41 */	bl __dla__FPv

 lbl_801EFE80:

 /* 801EFE80 001EBAE0  3B 7B 00 01 */	addi r27, r27, 1

 /* 801EFE84 001EBAE4  3B 9C 00 08 */	addi r28, r28, 8

@@ -2130,7 +2130,7 @@ lbl_801EFE8C:
 /* 801EFE98 001EBAF8  7C 04 00 40 */	cmplw r4, r0

 /* 801EFE9C 001EBAFC  41 80 FF C4 */	blt lbl_801EFE60

 /* 801EFEA0 001EBB00  80 7E 00 10 */	lwz r3, 0x10(r30)

-/* 801EFEA4 001EBB04  4B FE AC 19 */	bl func_801DAABC

+/* 801EFEA4 001EBB04  4B FE AC 19 */	bl __dla__FPv

 lbl_801EFEA8:

 /* 801EFEA8 001EBB08  80 7E 00 00 */	lwz r3, 0(r30)

 /* 801EFEAC 001EBB0C  80 9E 00 0C */	lwz r4, 0xc(r30)

@@ -2140,7 +2140,7 @@ lbl_801EFEA8:
 /* 801EFEBC 001EBB1C  2C 04 00 00 */	cmpwi r4, 0

 /* 801EFEC0 001EBB20  41 82 00 0C */	beq lbl_801EFECC

 /* 801EFEC4 001EBB24  38 64 FF F0 */	addi r3, r4, -16

-/* 801EFEC8 001EBB28  4B FE AB F5 */	bl func_801DAABC

+/* 801EFEC8 001EBB28  4B FE AB F5 */	bl __dla__FPv

 lbl_801EFECC:

 /* 801EFECC 001EBB2C  80 9E 00 00 */	lwz r4, 0(r30)

 /* 801EFED0 001EBB30  80 7E 00 08 */	lwz r3, 8(r30)

diff --git a/asm/code_801FA38C.s b/asm/code_801FA38C.s
index 00151af..ea0d0ff 100644
--- a/asm/code_801FA38C.s
+++ b/asm/code_801FA38C.s
@@ -24,7 +24,7 @@ func_801FA38C:
 /* 801FA3D0 001F6030  90 03 00 24 */	stw r0, 0x24(r3)

 /* 801FA3D4 001F6034  90 03 00 28 */	stw r0, 0x28(r3)

 /* 801FA3D8 001F6038  1C 64 00 44 */	mulli r3, r4, 0x44

-/* 801FA3DC 001F603C  4B FE 06 99 */	bl func_801DAA74

+/* 801FA3DC 001F603C  4B FE 06 99 */	bl __nwa__FUl

 /* 801FA3E0 001F6040  2C 03 00 00 */	cmpwi r3, 0

 /* 801FA3E4 001F6044  90 7E 00 10 */	stw r3, 0x10(r30)

 /* 801FA3E8 001F6048  41 82 00 10 */	beq lbl_801FA3F8

@@ -40,7 +40,7 @@ lbl_801FA3F8:
 /* 801FA40C 001F606C  7C 03 02 14 */	add r0, r3, r0

 /* 801FA410 001F6070  1F E0 00 0C */	mulli r31, r0, 0xc

 /* 801FA414 001F6074  7F E3 FB 78 */	mr r3, r31

-/* 801FA418 001F6078  4B FE 06 5D */	bl func_801DAA74

+/* 801FA418 001F6078  4B FE 06 5D */	bl __nwa__FUl

 /* 801FA41C 001F607C  2C 03 00 00 */	cmpwi r3, 0

 /* 801FA420 001F6080  90 7E 00 1C */	stw r3, 0x1c(r30)

 /* 801FA424 001F6084  41 82 00 18 */	beq lbl_801FA43C

diff --git a/asm/code_8021D424.s b/asm/code_8021D424.s
index cf982b0..12838a4 100644
--- a/asm/code_8021D424.s
+++ b/asm/code_8021D424.s
@@ -150,7 +150,7 @@ lbl_8021D614:
 /* 8021D630 00219290  41 82 02 0C */	beq lbl_8021D83C

 /* 8021D634 00219294  1C 7B 00 3C */	mulli r3, r27, 0x3c

 /* 8021D638 00219298  38 63 00 10 */	addi r3, r3, 0x10

-/* 8021D63C 0021929C  4B FB D4 39 */	bl func_801DAA74

+/* 8021D63C 0021929C  4B FB D4 39 */	bl __nwa__FUl

 /* 8021D640 002192A0  3C 80 80 22 */	lis r4, lbl_8021EA24@ha

 /* 8021D644 002192A4  7F 67 DB 78 */	mr r7, r27

 /* 8021D648 002192A8  38 84 EA 24 */	addi r4, r4, lbl_8021EA24@l

@@ -162,7 +162,7 @@ lbl_8021D614:
 /* 8021D660 002192C0  41 82 01 DC */	beq lbl_8021D83C

 /* 8021D664 002192C4  1C 7E 00 0C */	mulli r3, r30, 0xc

 /* 8021D668 002192C8  38 63 00 10 */	addi r3, r3, 0x10

-/* 8021D66C 002192CC  4B FB D4 09 */	bl func_801DAA74

+/* 8021D66C 002192CC  4B FB D4 09 */	bl __nwa__FUl

 /* 8021D670 002192D0  3C 80 80 03 */	lis r4, func_8002A294@ha

 /* 8021D674 002192D4  7F C7 F3 78 */	mr r7, r30

 /* 8021D678 002192D8  38 84 A2 94 */	addi r4, r4, func_8002A294@l

@@ -339,14 +339,14 @@ lbl_8021D8E4:
 /* 8021D8EC 0021954C  41 82 00 10 */	beq lbl_8021D8FC

 /* 8021D8F0 00219550  41 82 00 0C */	beq lbl_8021D8FC

 /* 8021D8F4 00219554  38 63 FF F0 */	addi r3, r3, -16

-/* 8021D8F8 00219558  4B FB D1 C5 */	bl func_801DAABC

+/* 8021D8F8 00219558  4B FB D1 C5 */	bl __dla__FPv

 lbl_8021D8FC:

 /* 8021D8FC 0021955C  80 7D 00 14 */	lwz r3, 0x14(r29)

 /* 8021D900 00219560  2C 03 00 00 */	cmpwi r3, 0

 /* 8021D904 00219564  41 82 00 10 */	beq lbl_8021D914

 /* 8021D908 00219568  41 82 00 0C */	beq lbl_8021D914

 /* 8021D90C 0021956C  38 63 FF F0 */	addi r3, r3, -16

-/* 8021D910 00219570  4B FB D1 AD */	bl func_801DAABC

+/* 8021D910 00219570  4B FB D1 AD */	bl __dla__FPv

 lbl_8021D914:

 /* 8021D914 00219574  38 00 00 00 */	li r0, 0

 /* 8021D918 00219578  7F A3 EB 78 */	mr r3, r29

diff --git a/asm/code_8022773C.s b/asm/code_8022773C.s
index c77b8b9..2beedce 100644
--- a/asm/code_8022773C.s
+++ b/asm/code_8022773C.s
@@ -566,7 +566,7 @@ func_80227E58:
 /* 80227E88 00223AE8  90 83 00 04 */	stw r4, 4(r3)

 /* 80227E8C 00223AEC  90 03 00 0C */	stw r0, 0xc(r3)

 /* 80227E90 00223AF0  38 65 00 10 */	addi r3, r5, 0x10

-/* 80227E94 00223AF4  4B FB 2B E1 */	bl func_801DAA74

+/* 80227E94 00223AF4  4B FB 2B E1 */	bl __nwa__FUl

 /* 80227E98 00223AF8  3C 80 80 22 */	lis r4, lbl_80227B84@ha

 /* 80227E9C 00223AFC  7F E7 FB 78 */	mr r7, r31

 /* 80227EA0 00223B00  38 84 7B 84 */	addi r4, r4, lbl_80227B84@l

@@ -605,7 +605,7 @@ lbl_80227ED0:
 /* 80227F1C 00223B7C  90 83 00 14 */	stw r4, 0x14(r3)

 /* 80227F20 00223B80  41 82 00 0C */	beq lbl_80227F2C

 /* 80227F24 00223B84  38 65 FF F0 */	addi r3, r5, -16

-/* 80227F28 00223B88  4B FB 2B 95 */	bl func_801DAABC

+/* 80227F28 00223B88  4B FB 2B 95 */	bl __dla__FPv

 lbl_80227F2C:

 /* 80227F2C 00223B8C  2C 1F 00 00 */	cmpwi r31, 0

 /* 80227F30 00223B90  40 81 00 0C */	ble lbl_80227F3C

diff --git a/asm/code_80228B0C.s b/asm/code_80228B0C.s
index 581f2f0..d13d3c2 100644
--- a/asm/code_80228B0C.s
+++ b/asm/code_80228B0C.s
@@ -202,7 +202,7 @@ func_80228D38:
 /* 80228D58 002249B8  93 81 00 10 */	stw r28, 0x10(r1)

 /* 80228D5C 002249BC  7C 7C 1B 78 */	mr r28, r3

 /* 80228D60 002249C0  38 65 00 10 */	addi r3, r5, 0x10

-/* 80228D64 002249C4  4B FB 1D 11 */	bl func_801DAA74

+/* 80228D64 002249C4  4B FB 1D 11 */	bl __nwa__FUl

 /* 80228D68 002249C8  3C 80 80 23 */	lis r4, lbl_80228B0C@ha

 /* 80228D6C 002249CC  7F A7 EB 78 */	mr r7, r29

 /* 80228D70 002249D0  38 84 8B 0C */	addi r4, r4, lbl_80228B0C@l

diff --git a/asm/code_8022910C.s b/asm/code_8022910C.s
index d587e9d..d46fdcd 100644
--- a/asm/code_8022910C.s
+++ b/asm/code_8022910C.s
@@ -292,14 +292,14 @@ lbl_802294C8:
 /* 802294C8 00225128  80 7F 01 54 */	lwz r3, 0x154(r31)

 /* 802294CC 0022512C  2C 03 00 00 */	cmpwi r3, 0

 /* 802294D0 00225130  41 82 00 10 */	beq lbl_802294E0

-/* 802294D4 00225134  4B FB 15 E9 */	bl func_801DAABC

+/* 802294D4 00225134  4B FB 15 E9 */	bl __dla__FPv

 /* 802294D8 00225138  38 00 00 00 */	li r0, 0

 /* 802294DC 0022513C  90 1F 01 54 */	stw r0, 0x154(r31)

 lbl_802294E0:

 /* 802294E0 00225140  80 7F 01 5C */	lwz r3, 0x15c(r31)

 /* 802294E4 00225144  2C 03 00 00 */	cmpwi r3, 0

 /* 802294E8 00225148  41 82 00 10 */	beq lbl_802294F8

-/* 802294EC 0022514C  4B FB 15 D1 */	bl func_801DAABC

+/* 802294EC 0022514C  4B FB 15 D1 */	bl __dla__FPv

 /* 802294F0 00225150  38 00 00 00 */	li r0, 0

 /* 802294F4 00225154  90 1F 01 5C */	stw r0, 0x15c(r31)

 lbl_802294F8:

@@ -325,7 +325,7 @@ func_80229514:
 /* 80229538 00225198  7C 7C 1B 78 */	mr r28, r3

 /* 8022953C 0022519C  4B FF FF 3D */	bl func_80229478

 /* 80229540 002251A0  57 A3 18 38 */	slwi r3, r29, 3

-/* 80229544 002251A4  4B FB 15 31 */	bl func_801DAA74

+/* 80229544 002251A4  4B FB 15 31 */	bl __nwa__FUl

 /* 80229548 002251A8  2C 03 00 00 */	cmpwi r3, 0

 /* 8022954C 002251AC  90 7C 01 54 */	stw r3, 0x154(r28)

 /* 80229550 002251B0  41 82 00 28 */	beq lbl_80229578

@@ -343,7 +343,7 @@ lbl_80229568:
 lbl_80229578:

 /* 80229578 002251D8  57 DF 10 3A */	slwi r31, r30, 2

 /* 8022957C 002251DC  7F E3 FB 78 */	mr r3, r31

-/* 80229580 002251E0  4B FB 14 F5 */	bl func_801DAA74

+/* 80229580 002251E0  4B FB 14 F5 */	bl __nwa__FUl

 /* 80229584 002251E4  2C 03 00 00 */	cmpwi r3, 0

 /* 80229588 002251E8  90 7C 01 5C */	stw r3, 0x15c(r28)

 /* 8022958C 002251EC  41 82 00 10 */	beq lbl_8022959C

diff --git a/asm/code_80247038.s b/asm/code_80247038.s
index 4510135..dc26fa8 100644
--- a/asm/code_80247038.s
+++ b/asm/code_80247038.s
@@ -12,7 +12,7 @@ func_80247038:
 /* 8024704C 00242CAC  7C 7F 1B 78 */	mr r31, r3

 /* 80247050 00242CB0  90 83 00 00 */	stw r4, 0(r3)

 /* 80247054 00242CB4  54 03 10 3A */	slwi r3, r0, 2

-/* 80247058 00242CB8  4B F9 3A 1D */	bl func_801DAA74

+/* 80247058 00242CB8  4B F9 3A 1D */	bl __nwa__FUl

 /* 8024705C 00242CBC  2C 03 00 00 */	cmpwi r3, 0

 /* 80247060 00242CC0  90 7F 00 04 */	stw r3, 4(r31)

 /* 80247064 00242CC4  41 82 00 0C */	beq lbl_80247070

@@ -40,7 +40,7 @@ func_80247088:
 /* 802470AC 00242D0C  80 63 00 04 */	lwz r3, 4(r3)

 /* 802470B0 00242D10  2C 03 00 00 */	cmpwi r3, 0

 /* 802470B4 00242D14  41 82 00 08 */	beq lbl_802470BC

-/* 802470B8 00242D18  4B F9 3A 05 */	bl func_801DAABC

+/* 802470B8 00242D18  4B F9 3A 05 */	bl __dla__FPv

 lbl_802470BC:

 /* 802470BC 00242D1C  2C 1F 00 00 */	cmpwi r31, 0

 /* 802470C0 00242D20  40 81 00 0C */	ble lbl_802470CC

diff --git a/asm/code_80254460.s b/asm/code_80254460.s
index 899d209..ba00176 100644
--- a/asm/code_80254460.s
+++ b/asm/code_80254460.s
@@ -216,7 +216,7 @@ lbl_8025474C:
 /* 8025474C 002503AC  1C 98 00 2C */	mulli r4, r24, 0x2c

 /* 80254750 002503B0  90 7E 00 04 */	stw r3, 4(r30)

 /* 80254754 002503B4  38 64 00 10 */	addi r3, r4, 0x10

-/* 80254758 002503B8  4B F8 63 1D */	bl func_801DAA74

+/* 80254758 002503B8  4B F8 63 1D */	bl __nwa__FUl

 /* 8025475C 002503BC  3C 80 80 38 */	lis r4, __ct__Q34nw4r3snd9SoundHeapFv@ha

 /* 80254760 002503C0  3C A0 80 38 */	lis r5, __dt__Q34nw4r3snd9SoundHeapFv@ha

 /* 80254764 002503C4  7F 07 C3 78 */	mr r7, r24

@@ -290,7 +290,7 @@ lbl_80254860:
 /* 80254860 002504C0  57 9C 08 3C */	slwi r28, r28, 1

 /* 80254864 002504C4  57 83 10 3A */	slwi r3, r28, 2

 /* 80254868 002504C8  38 63 00 10 */	addi r3, r3, 0x10

-/* 8025486C 002504CC  4B F8 62 09 */	bl func_801DAA74

+/* 8025486C 002504CC  4B F8 62 09 */	bl __nwa__FUl

 /* 80254870 002504D0  3C 80 80 25 */	lis r4, lbl_80256E80@ha

 /* 80254874 002504D4  3C A0 80 25 */	lis r5, lbl_80256E8C@ha

 /* 80254878 002504D8  7F 87 E3 78 */	mr r7, r28

diff --git a/asm/code_8025716C.s b/asm/code_8025716C.s
index ee3d342..362c90c 100644
--- a/asm/code_8025716C.s
+++ b/asm/code_8025716C.s
@@ -2322,7 +2322,7 @@ func_80259164:
 /* 802591C0 00254E20  48 00 00 68 */	b lbl_80259228

 lbl_802591C4:

 /* 802591C4 00254E24  1C 7D 03 D8 */	mulli r3, r29, 0x3d8

-/* 802591C8 00254E28  4B F8 18 AD */	bl func_801DAA74

+/* 802591C8 00254E28  4B F8 18 AD */	bl __nwa__FUl

 /* 802591CC 00254E2C  1C BD 03 D8 */	mulli r5, r29, 0x3d8

 /* 802591D0 00254E30  90 6D A6 58 */	stw r3, lbl_8063F918-_SDA_BASE_(r13)

 /* 802591D4 00254E34  38 80 00 00 */	li r4, 0

@@ -2372,7 +2372,7 @@ lbl_80259228:
 /* 80259278 00254ED8  80 6D A6 58 */	lwz r3, lbl_8063F918-_SDA_BASE_(r13)

 /* 8025927C 00254EDC  2C 03 00 00 */	cmpwi r3, 0

 /* 80259280 00254EE0  41 82 00 14 */	beq lbl_80259294

-/* 80259284 00254EE4  4B F8 18 39 */	bl func_801DAABC

+/* 80259284 00254EE4  4B F8 18 39 */	bl __dla__FPv

 /* 80259288 00254EE8  38 00 00 00 */	li r0, 0

 /* 8025928C 00254EEC  90 0D A6 58 */	stw r0, lbl_8063F918-_SDA_BASE_(r13)

 /* 80259290 00254EF0  B0 0D A6 5C */	sth r0, lbl_8063F91C-_SDA_BASE_(r13)