Fix symbol names (#118)

* checkpoint * checkpoint * rename f_pc * checkpoint * small symbol rename and fix some fpc symbols * remove unneeded entries from ldscript * simplify ok check, update docker container Co-authored-by: Pheenoh <pheenoh@gmail.com>
2026-08-14 04:32:38 -04:00 · 2021-03-15 07:12:44 +01:00
parent 3b69d4cba0
commit 80ba3d9fd2
3357 changed files with 59145 additions and 59695 deletions
@@ -4,8 +4,8 @@
 /* 80018B34 00015A74  3C 60 80 3F */ lis r3, g_HIO@ha
 /* 80018B38 00015A78  38 63 1B BC */ addi r3, r3, g_HIO@l
 /* 80018B3C 00015A7C  4B FF FE 09 */ bl __ct__11fapGm_HIO_cFv
-/* 80018B40 00015A80  3C 80 80 02 */ lis r4, fapGm_HIO_c_NS_dtor@ha
-/* 80018B44 00015A84  38 84 8A E0 */ addi r4, r4, fapGm_HIO_c_NS_dtor@l
+/* 80018B40 00015A80  3C 80 80 02 */ lis r4, __dt__11fapGm_HIO_cFv@ha
+/* 80018B44 00015A84  38 84 8A E0 */ addi r4, r4, __dt__11fapGm_HIO_cFv@l
 /* 80018B48 00015A88  3C A0 80 3F */ lis r5, lbl_803F1BB0@ha
 /* 80018B4C 00015A8C  38 A5 1B B0 */ addi r5, r5, lbl_803F1BB0@l
 /* 80018B50 00015A90  48 34 90 D5 */ bl func_80361C24
@@ -269,9 +269,9 @@ void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(void);
 void fopAcM_riverStream__FP4cXyzPsPff(void);
 void fopAcM_carryOffRevise__FP10fopAc_ac_c(void);
 void fopAcM_searchFromName4Event__FPCcs(void);
-void fopAcM_GetName(void);   // mostly inlined
-void fopAcM_GetID(void);     // mostly inlined
-void fopAcM_GetParam(void);  // mostly inlined
+void fopAcM_GetName__FPv(void);    // mostly inlined
+void fopAcM_GetID__FPCv(void);     // mostly inlined
+void fopAcM_GetParam__FPCv(void);  // mostly inlined
 }

 #endif
@@ -9,7 +9,7 @@
 /* 800198E4 00016824  7C 7F 1B 78 */ mr r31, r3
 /* 800198E8 00016828  80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13)
 /* 800198EC 0001682C  80 9F 00 B4 */ lwz r4, 0xb4(r31)
-/* 800198F0 00016830  48 00 6D 5D */ bl fpcBs_Is_JustOfType
+/* 800198F0 00016830  48 00 6D 5D */ bl fpcBs_Is_JustOfType__Fii
 /* 800198F4 00016834  2C 03 00 00 */ cmpwi r3, 0
 /* 800198F8 00016838  41 82 00 0C */ beq lbl_80019904
 /* 800198FC 0001683C  80 9F 00 C8 */ lwz r4, 0xc8(r31)
@@ -15,7 +15,7 @@
 /* 8001996C 000168AC  7C 7F 1B 78 */ mr r31, r3
 /* 80019970 000168B0  80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13)
 /* 80019974 000168B4  80 9F 00 B4 */ lwz r4, 0xb4(r31)
-/* 80019978 000168B8  48 00 6C D5 */ bl fpcBs_Is_JustOfType
+/* 80019978 000168B8  48 00 6C D5 */ bl fpcBs_Is_JustOfType__Fii
 /* 8001997C 000168BC  2C 03 00 00 */ cmpwi r3, 0
 /* 80019980 000168C0  41 82 00 0C */ beq lbl_8001998C
 /* 80019984 000168C4  80 9F 00 C8 */ lwz r4, 0xc8(r31)
@@ -16,7 +16,7 @@
 /* 80019CEC 00016C2C  38 84 88 C8 */ addi r4, r4, lbl_803788C8@l
 /* 80019CF0 00016C30  4B FF FF 89 */ bl fopAcM_Log__FPC10fopAc_ac_cPCc
 /* 80019CF4 00016C34  7F E3 FB 78 */ mr r3, r31
-/* 80019CF8 00016C38  48 00 84 21 */ bl fpcM_Delete
+/* 80019CF8 00016C38  48 00 84 21 */ bl fpcM_Delete__FPv
 /* 80019CFC 00016C3C  48 00 00 08 */ b lbl_80019D04
 lbl_80019D00:
 /* 80019D00 00016C40  38 60 00 01 */ li r3, 1
@@ -53,19 +53,19 @@ lbl_8001AD7C:
 /* 8001ADA4 00017CE4  3B A3 D8 E4 */ addi r29, r3, lbl_803DD8E4@l
 /* 8001ADA8 00017CE8  D0 1D 00 58 */ stfs f0, 0x58(r29)
 /* 8001ADAC 00017CEC  7F A3 EB 78 */ mr r3, r29
-/* 8001ADB0 00017CF0  48 25 89 DD */ bl J3DUClipper_NS_calcViewFrustum
+/* 8001ADB0 00017CF0  48 25 89 DD */ bl calcViewFrustum__11J3DUClipperFv
 /* 8001ADB4 00017CF4  3C 60 80 3E */ lis r3, lbl_803DD8E4@ha
 /* 8001ADB8 00017CF8  38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
 /* 8001ADBC 00017CFC  7F E4 FB 78 */ mr r4, r31
 /* 8001ADC0 00017D00  38 BE 05 14 */ addi r5, r30, 0x514
 /* 8001ADC4 00017D04  38 DE 05 08 */ addi r6, r30, 0x508
-/* 8001ADC8 00017D08  48 25 8C 7D */ bl J3DUClipper_NS_clip_X1_
+/* 8001ADC8 00017D08  48 25 8C 7D */ bl clip__11J3DUClipperCFPA4_CfP3VecP3Vec
 /* 8001ADCC 00017D0C  7C 7E 1B 78 */ mr r30, r3
 /* 8001ADD0 00017D10  C0 0D 86 F0 */ lfs f0, lbl_80450C70-_SDA_BASE_(r13)
 /* 8001ADD4 00017D14  D0 1D 00 58 */ stfs f0, 0x58(r29)
 /* 8001ADD8 00017D18  3C 60 80 3E */ lis r3, lbl_803DD8E4@ha
 /* 8001ADDC 00017D1C  38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
-/* 8001ADE0 00017D20  48 25 89 AD */ bl J3DUClipper_NS_calcViewFrustum
+/* 8001ADE0 00017D20  48 25 89 AD */ bl calcViewFrustum__11J3DUClipperFv
 /* 8001ADE4 00017D24  7F C3 F3 78 */ mr r3, r30
 /* 8001ADE8 00017D28  48 00 02 58 */ b lbl_8001B040
 lbl_8001ADEC:
@@ -74,7 +74,7 @@ lbl_8001ADEC:
 /* 8001ADF4 00017D34  7F E4 FB 78 */ mr r4, r31
 /* 8001ADF8 00017D38  38 BE 05 14 */ addi r5, r30, 0x514
 /* 8001ADFC 00017D3C  38 DE 05 08 */ addi r6, r30, 0x508
-/* 8001AE00 00017D40  48 25 8C 45 */ bl J3DUClipper_NS_clip_X1_
+/* 8001AE00 00017D40  48 25 8C 45 */ bl clip__11J3DUClipperCFPA4_CfP3VecP3Vec
 /* 8001AE04 00017D44  48 00 02 3C */ b lbl_8001B040
 lbl_8001AE08:
 /* 8001AE08 00017D48  1C 83 00 18 */ mulli r4, r3, 0x18
@@ -90,19 +90,19 @@ lbl_8001AE08:
 /* 8001AE30 00017D70  3B A3 D8 E4 */ addi r29, r3, lbl_803DD8E4@l
 /* 8001AE34 00017D74  D0 1D 00 58 */ stfs f0, 0x58(r29)
 /* 8001AE38 00017D78  7F A3 EB 78 */ mr r3, r29
-/* 8001AE3C 00017D7C  48 25 89 51 */ bl J3DUClipper_NS_calcViewFrustum
+/* 8001AE3C 00017D7C  48 25 89 51 */ bl calcViewFrustum__11J3DUClipperFv
 /* 8001AE40 00017D80  3C 60 80 3E */ lis r3, lbl_803DD8E4@ha
 /* 8001AE44 00017D84  38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
 /* 8001AE48 00017D88  7F E4 FB 78 */ mr r4, r31
 /* 8001AE4C 00017D8C  38 BE 00 0C */ addi r5, r30, 0xc
 /* 8001AE50 00017D90  7F C6 F3 78 */ mr r6, r30
-/* 8001AE54 00017D94  48 25 8B F1 */ bl J3DUClipper_NS_clip_X1_
+/* 8001AE54 00017D94  48 25 8B F1 */ bl clip__11J3DUClipperCFPA4_CfP3VecP3Vec
 /* 8001AE58 00017D98  7C 7E 1B 78 */ mr r30, r3
 /* 8001AE5C 00017D9C  C0 0D 86 F0 */ lfs f0, lbl_80450C70-_SDA_BASE_(r13)
 /* 8001AE60 00017DA0  D0 1D 00 58 */ stfs f0, 0x58(r29)
 /* 8001AE64 00017DA4  3C 60 80 3E */ lis r3, lbl_803DD8E4@ha
 /* 8001AE68 00017DA8  38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
-/* 8001AE6C 00017DAC  48 25 89 21 */ bl J3DUClipper_NS_calcViewFrustum
+/* 8001AE6C 00017DAC  48 25 89 21 */ bl calcViewFrustum__11J3DUClipperFv
 /* 8001AE70 00017DB0  7F C3 F3 78 */ mr r3, r30
 /* 8001AE74 00017DB4  48 00 01 CC */ b lbl_8001B040
 lbl_8001AE78:
@@ -111,7 +111,7 @@ lbl_8001AE78:
 /* 8001AE80 00017DC0  7F E4 FB 78 */ mr r4, r31
 /* 8001AE84 00017DC4  38 BE 00 0C */ addi r5, r30, 0xc
 /* 8001AE88 00017DC8  7F C6 F3 78 */ mr r6, r30
-/* 8001AE8C 00017DCC  48 25 8B B9 */ bl J3DUClipper_NS_clip_X1_
+/* 8001AE8C 00017DCC  48 25 8B B9 */ bl clip__11J3DUClipperCFPA4_CfP3VecP3Vec
 /* 8001AE90 00017DD0  48 00 01 B0 */ b lbl_8001B040
 lbl_8001AE94:
 /* 8001AE94 00017DD4  2C 03 00 17 */ cmpwi r3, 0x17
@@ -125,7 +125,7 @@ lbl_8001AE94:
 /* 8001AEB4 00017DF4  3B A3 D8 E4 */ addi r29, r3, lbl_803DD8E4@l
 /* 8001AEB8 00017DF8  D0 1D 00 58 */ stfs f0, 0x58(r29)
 /* 8001AEBC 00017DFC  7F A3 EB 78 */ mr r3, r29
-/* 8001AEC0 00017E00  48 25 88 CD */ bl J3DUClipper_NS_calcViewFrustum
+/* 8001AEC0 00017E00  48 25 88 CD */ bl calcViewFrustum__11J3DUClipperFv
 /* 8001AEC4 00017E04  C0 3E 05 14 */ lfs f1, 0x514(r30)
 /* 8001AEC8 00017E08  C0 1E 05 08 */ lfs f0, 0x508(r30)
 /* 8001AECC 00017E0C  D0 01 00 38 */ stfs f0, 0x38(r1)
@@ -143,13 +143,13 @@ lbl_8001AE94:
 /* 8001AEFC 00017E3C  38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
 /* 8001AF00 00017E40  7F E4 FB 78 */ mr r4, r31
 /* 8001AF04 00017E44  38 A1 00 44 */ addi r5, r1, 0x44
-/* 8001AF08 00017E48  48 25 89 F5 */ bl J3DUClipper_NS_clip
+/* 8001AF08 00017E48  48 25 89 F5 */ bl clip__11J3DUClipperCFPA4_Cf3Vecf
 /* 8001AF0C 00017E4C  7C 7E 1B 78 */ mr r30, r3
 /* 8001AF10 00017E50  C0 0D 86 F0 */ lfs f0, lbl_80450C70-_SDA_BASE_(r13)
 /* 8001AF14 00017E54  D0 1D 00 58 */ stfs f0, 0x58(r29)
 /* 8001AF18 00017E58  3C 60 80 3E */ lis r3, lbl_803DD8E4@ha
 /* 8001AF1C 00017E5C  38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
-/* 8001AF20 00017E60  48 25 88 6D */ bl J3DUClipper_NS_calcViewFrustum
+/* 8001AF20 00017E60  48 25 88 6D */ bl calcViewFrustum__11J3DUClipperFv
 /* 8001AF24 00017E64  7F C3 F3 78 */ mr r3, r30
 /* 8001AF28 00017E68  48 00 01 18 */ b lbl_8001B040
 lbl_8001AF2C:
@@ -170,7 +170,7 @@ lbl_8001AF2C:
 /* 8001AF64 00017EA4  38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
 /* 8001AF68 00017EA8  7F E4 FB 78 */ mr r4, r31
 /* 8001AF6C 00017EAC  38 A1 00 2C */ addi r5, r1, 0x2c
-/* 8001AF70 00017EB0  48 25 89 8D */ bl J3DUClipper_NS_clip
+/* 8001AF70 00017EB0  48 25 89 8D */ bl clip__11J3DUClipperCFPA4_Cf3Vecf
 /* 8001AF74 00017EB4  48 00 00 CC */ b lbl_8001B040
 lbl_8001AF78:
 /* 8001AF78 00017EB8  38 03 FF F1 */ addi r0, r3, -15
@@ -187,7 +187,7 @@ lbl_8001AF78:
 /* 8001AFA4 00017EE4  3B C3 D8 E4 */ addi r30, r3, lbl_803DD8E4@l
 /* 8001AFA8 00017EE8  D0 1E 00 58 */ stfs f0, 0x58(r30)
 /* 8001AFAC 00017EEC  7F C3 F3 78 */ mr r3, r30
-/* 8001AFB0 00017EF0  48 25 87 DD */ bl J3DUClipper_NS_calcViewFrustum
+/* 8001AFB0 00017EF0  48 25 87 DD */ bl calcViewFrustum__11J3DUClipperFv
 /* 8001AFB4 00017EF4  C0 3D 00 0C */ lfs f1, 0xc(r29)
 /* 8001AFB8 00017EF8  80 9D 00 00 */ lwz r4, 0(r29)
 /* 8001AFBC 00017EFC  80 7D 00 04 */ lwz r3, 4(r29)
@@ -202,13 +202,13 @@ lbl_8001AF78:
 /* 8001AFE0 00017F20  38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
 /* 8001AFE4 00017F24  7F E4 FB 78 */ mr r4, r31
 /* 8001AFE8 00017F28  38 A1 00 20 */ addi r5, r1, 0x20
-/* 8001AFEC 00017F2C  48 25 89 11 */ bl J3DUClipper_NS_clip
+/* 8001AFEC 00017F2C  48 25 89 11 */ bl clip__11J3DUClipperCFPA4_Cf3Vecf
 /* 8001AFF0 00017F30  7C 7D 1B 78 */ mr r29, r3
 /* 8001AFF4 00017F34  C0 0D 86 F0 */ lfs f0, lbl_80450C70-_SDA_BASE_(r13)
 /* 8001AFF8 00017F38  D0 1E 00 58 */ stfs f0, 0x58(r30)
 /* 8001AFFC 00017F3C  3C 60 80 3E */ lis r3, lbl_803DD8E4@ha
 /* 8001B000 00017F40  38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
-/* 8001B004 00017F44  48 25 87 89 */ bl J3DUClipper_NS_calcViewFrustum
+/* 8001B004 00017F44  48 25 87 89 */ bl calcViewFrustum__11J3DUClipperFv
 /* 8001B008 00017F48  7F A3 EB 78 */ mr r3, r29
 /* 8001B00C 00017F4C  48 00 00 34 */ b lbl_8001B040
 lbl_8001B010:
@@ -223,7 +223,7 @@ lbl_8001B010:
 /* 8001B030 00017F70  38 63 D8 E4 */ addi r3, r3, lbl_803DD8E4@l
 /* 8001B034 00017F74  7F E4 FB 78 */ mr r4, r31
 /* 8001B038 00017F78  38 A1 00 14 */ addi r5, r1, 0x14
-/* 8001B03C 00017F7C  48 25 88 C1 */ bl J3DUClipper_NS_clip
+/* 8001B03C 00017F7C  48 25 88 C1 */ bl clip__11J3DUClipperCFPA4_Cf3Vecf
 lbl_8001B040:
 /* 8001B040 00017F80  39 61 00 A0 */ addi r11, r1, 0xa0
 /* 8001B044 00017F84  48 34 71 E5 */ bl _restgpr_29
@@ -35,7 +35,7 @@ lbl_8001B0D4:
 /* 8001B0DC 0001801C  38 80 00 00 */ li r4, 0
 /* 8001B0E0 00018020  38 E0 01 4F */ li r7, 0x14f
 /* 8001B0E4 00018024  39 40 FF FF */ li r10, -1
-/* 8001B0E8 00018028  48 02 65 81 */ bl dEvt_control_c_NS_order
+/* 8001B0E8 00018028  48 02 65 81 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
 lbl_8001B0EC:
 /* 8001B0EC 0001802C  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001B0F0 00018030  7C 08 03 A6 */ mtlr r0
@@ -38,7 +38,7 @@ lbl_8001B16C:
 /* 8001B17C 000180BC  7C E6 3B 78 */ mr r6, r7
 /* 8001B180 000180C0  38 E0 01 4F */ li r7, 0x14f
 /* 8001B184 000180C4  39 40 FF FF */ li r10, -1
-/* 8001B188 000180C8  48 02 64 E1 */ bl dEvt_control_c_NS_order
+/* 8001B188 000180C8  48 02 64 E1 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
 lbl_8001B18C:
 /* 8001B18C 000180CC  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001B190 000180D0  7C 08 03 A6 */ mtlr r0
@@ -40,7 +40,7 @@ lbl_8001B20C:
 /* 8001B224 00018164  39 08 61 C0 */ addi r8, r8, g_dComIfG_gameInfo@l
 /* 8001B228 00018168  81 08 5D AC */ lwz r8, 0x5dac(r8)
 /* 8001B22C 0001816C  39 40 FF FF */ li r10, -1
-/* 8001B230 00018170  48 02 64 39 */ bl dEvt_control_c_NS_order
+/* 8001B230 00018170  48 02 64 39 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
 lbl_8001B234:
 /* 8001B234 00018174  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001B238 00018178  7C 08 03 A6 */ mtlr r0
@@ -45,7 +45,7 @@ lbl_8001B2C0:
 /* 8001B2E0 00018220  7F C4 F3 78 */ mr r4, r30
 /* 8001B2E4 00018224  38 A0 00 00 */ li r5, 0
 /* 8001B2E8 00018228  7F A6 EB 78 */ mr r6, r29
-/* 8001B2EC 0001822C  48 02 C4 6D */ bl dEvent_manager_c_NS_getEventIdx_X2_
+/* 8001B2EC 0001822C  48 02 C4 6D */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc
 /* 8001B2F0 00018230  7C 6A 1B 78 */ mr r10, r3
 lbl_8001B2F4:
 /* 8001B2F4 00018234  93 A1 00 08 */ stw r29, 8(r1)
@@ -57,7 +57,7 @@ lbl_8001B2F4:
 /* 8001B30C 0001824C  38 E7 FF FF */ addi r7, r7, 0x0000FFFF@l
 /* 8001B310 00018250  7F C8 F3 78 */ mr r8, r30
 /* 8001B314 00018254  7F E9 FB 78 */ mr r9, r31
-/* 8001B318 00018258  48 02 63 51 */ bl dEvt_control_c_NS_order
+/* 8001B318 00018258  48 02 63 51 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
 lbl_8001B31C:
 /* 8001B31C 0001825C  39 61 00 30 */ addi r11, r1, 0x30
 /* 8001B320 00018260  48 34 6E FD */ bl _restgpr_26
@@ -36,7 +36,7 @@ lbl_8001B3A0:
 /* 8001B3AC 000182EC  3C E0 00 01 */ lis r7, 0x0000FFFF@ha
 /* 8001B3B0 000182F0  38 E7 FF FF */ addi r7, r7, 0x0000FFFF@l
 /* 8001B3B4 000182F4  39 40 FF FF */ li r10, -1
-/* 8001B3B8 000182F8  48 02 62 B1 */ bl dEvt_control_c_NS_order
+/* 8001B3B8 000182F8  48 02 62 B1 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
 lbl_8001B3BC:
 /* 8001B3BC 000182FC  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001B3C0 00018300  7C 08 03 A6 */ mtlr r0
@@ -36,7 +36,7 @@ lbl_8001B440:
 /* 8001B448 00018388  7F 84 E3 78 */ mr r4, r28
 /* 8001B44C 0001838C  7D 05 43 78 */ mr r5, r8
 /* 8001B450 00018390  38 C0 00 FF */ li r6, 0xff
-/* 8001B454 00018394  48 02 C3 05 */ bl dEvent_manager_c_NS_getEventIdx_X2_
+/* 8001B454 00018394  48 02 C3 05 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc
 /* 8001B458 00018398  7C 79 1B 78 */ mr r25, r3
 /* 8001B45C 0001839C  7F 20 07 35 */ extsh. r0, r25
 /* 8001B460 000183A0  40 80 00 0C */ bge lbl_8001B46C
@@ -46,7 +46,7 @@ lbl_8001B46C:
 /* 8001B46C 000183AC  7F 43 D3 78 */ mr r3, r26
 /* 8001B470 000183B0  7F 84 E3 78 */ mr r4, r28
 /* 8001B474 000183B4  7F 25 CB 78 */ mr r5, r25
-/* 8001B478 000183B8  48 02 CD 7D */ bl dEvent_manager_c_NS_getEventPrio
+/* 8001B478 000183B8  48 02 CD 7D */ bl getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs
 /* 8001B47C 000183BC  54 7A 04 3F */ clrlwi. r26, r3, 0x10
 /* 8001B480 000183C0  40 82 00 08 */ bne lbl_8001B488
 /* 8001B484 000183C4  3B 40 00 FF */ li r26, 0xff
@@ -67,7 +67,7 @@ lbl_8001B494:
 /* 8001B4B8 000183F8  7F A7 EB 78 */ mr r7, r29
 /* 8001B4BC 000183FC  7F 88 E3 78 */ mr r8, r28
 /* 8001B4C0 00018400  7F 2A CB 78 */ mr r10, r25
-/* 8001B4C4 00018404  48 02 61 A5 */ bl dEvt_control_c_NS_order
+/* 8001B4C4 00018404  48 02 61 A5 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
 lbl_8001B4C8:
 /* 8001B4C8 00018408  39 61 00 30 */ addi r11, r1, 0x30
 /* 8001B4CC 0001840C  48 34 6D 4D */ bl _restgpr_25
@@ -35,7 +35,7 @@ lbl_8001B554:
 /* 8001B558 00018498  7F 23 CB 78 */ mr r3, r25
 /* 8001B55C 0001849C  7F 44 D3 78 */ mr r4, r26
 /* 8001B560 000184A0  38 C0 00 FF */ li r6, 0xff
-/* 8001B564 000184A4  48 02 C1 F5 */ bl dEvent_manager_c_NS_getEventIdx_X2_
+/* 8001B564 000184A4  48 02 C1 F5 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc
 /* 8001B568 000184A8  7C 78 1B 78 */ mr r24, r3
 /* 8001B56C 000184AC  7F 00 07 35 */ extsh. r0, r24
 /* 8001B570 000184B0  40 80 00 0C */ bge lbl_8001B57C
@@ -45,7 +45,7 @@ lbl_8001B57C:
 /* 8001B57C 000184BC  7F 23 CB 78 */ mr r3, r25
 /* 8001B580 000184C0  7F 44 D3 78 */ mr r4, r26
 /* 8001B584 000184C4  7F 05 C3 78 */ mr r5, r24
-/* 8001B588 000184C8  48 02 CC 6D */ bl dEvent_manager_c_NS_getEventPrio
+/* 8001B588 000184C8  48 02 CC 6D */ bl getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs
 /* 8001B58C 000184CC  54 65 04 3F */ clrlwi. r5, r3, 0x10
 /* 8001B590 000184D0  40 82 00 08 */ bne lbl_8001B598
 /* 8001B594 000184D4  38 A0 00 FF */ li r5, 0xff
@@ -63,7 +63,7 @@ lbl_8001B5A4:
 /* 8001B5BC 000184FC  7F 48 D3 78 */ mr r8, r26
 /* 8001B5C0 00018500  7F 69 DB 78 */ mr r9, r27
 /* 8001B5C4 00018504  7F 0A C3 78 */ mr r10, r24
-/* 8001B5C8 00018508  48 02 60 A1 */ bl dEvt_control_c_NS_order
+/* 8001B5C8 00018508  48 02 60 A1 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
 lbl_8001B5CC:
 /* 8001B5CC 0001850C  39 61 00 30 */ addi r11, r1, 0x30
 /* 8001B5D0 00018510  48 34 6C 45 */ bl _restgpr_24
@@ -12,7 +12,7 @@
 /* 8001B610 00018550  38 7F 4F F8 */ addi r3, r31, 0x4ff8
 /* 8001B614 00018554  7F 44 D3 78 */ mr r4, r26
 /* 8001B618 00018558  7F 65 DB 78 */ mr r5, r27
-/* 8001B61C 0001855C  48 02 CB D9 */ bl dEvent_manager_c_NS_getEventPrio
+/* 8001B61C 0001855C  48 02 CB D9 */ bl getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs
 /* 8001B620 00018560  54 7E 04 3F */ clrlwi. r30, r3, 0x10
 /* 8001B624 00018564  40 82 00 08 */ bne lbl_8001B62C
 /* 8001B628 00018568  3B C0 00 FF */ li r30, 0xff
@@ -30,7 +30,7 @@ lbl_8001B62C:
 /* 8001B654 00018594  7F A7 EB 78 */ mr r7, r29
 /* 8001B658 00018598  7F 48 D3 78 */ mr r8, r26
 /* 8001B65C 0001859C  7F 6A DB 78 */ mr r10, r27
-/* 8001B660 000185A0  48 02 60 09 */ bl dEvt_control_c_NS_order
+/* 8001B660 000185A0  48 02 60 09 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
 /* 8001B664 000185A4  39 61 00 30 */ addi r11, r1, 0x30
 /* 8001B668 000185A8  48 34 6B B5 */ bl _restgpr_26
 /* 8001B66C 000185AC  80 01 00 34 */ lwz r0, 0x34(r1)
@@ -50,7 +50,7 @@ lbl_8001B720:
 /* 8001B728 00018668  38 63 4F F8 */ addi r3, r3, 0x4ff8
 /* 8001B72C 0001866C  7F 44 D3 78 */ mr r4, r26
 /* 8001B730 00018670  7F 65 DB 78 */ mr r5, r27
-/* 8001B734 00018674  48 02 CA C1 */ bl dEvent_manager_c_NS_getEventPrio
+/* 8001B734 00018674  48 02 CA C1 */ bl getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs
 /* 8001B738 00018678  54 60 04 3F */ clrlwi. r0, r3, 0x10
 /* 8001B73C 0001867C  41 82 00 0C */ beq lbl_8001B748
 /* 8001B740 00018680  7C 19 03 78 */ mr r25, r0
@@ -61,7 +61,7 @@ lbl_8001B748:
 /* 8001B750 00018690  41 82 00 1C */ beq lbl_8001B76C
 /* 8001B754 00018694  7F 83 E3 78 */ mr r3, r28
 /* 8001B758 00018698  7F 04 C3 78 */ mr r4, r24
-/* 8001B75C 0001869C  48 02 7D A5 */ bl dEvt_control_c_NS_searchMapEventData_X1_
+/* 8001B75C 0001869C  48 02 7D A5 */ bl searchMapEventData__14dEvt_control_cFUcl
 /* 8001B760 000186A0  28 03 00 00 */ cmplwi r3, 0
 /* 8001B764 000186A4  41 82 00 08 */ beq lbl_8001B76C
 /* 8001B768 000186A8  8B 23 00 06 */ lbz r25, 6(r3)
@@ -77,7 +77,7 @@ lbl_8001B76C:
 /* 8001B78C 000186CC  7F A7 EB 78 */ mr r7, r29
 /* 8001B790 000186D0  7F 48 D3 78 */ mr r8, r26
 /* 8001B794 000186D4  7F 6A DB 78 */ mr r10, r27
-/* 8001B798 000186D8  48 02 5E D1 */ bl dEvt_control_c_NS_order
+/* 8001B798 000186D8  48 02 5E D1 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
 lbl_8001B79C:
 /* 8001B79C 000186DC  39 61 00 30 */ addi r11, r1, 0x30
 /* 8001B7A0 000186E0  48 34 6A 75 */ bl _restgpr_24
@@ -42,7 +42,7 @@ lbl_8001B82C:
 /* 8001B848 00018788  7C 04 03 78 */ mr r4, r0
 lbl_8001B84C:
 /* 8001B84C 0001878C  7F 23 CB 78 */ mr r3, r25
-/* 8001B850 00018790  48 02 7C B1 */ bl dEvt_control_c_NS_searchMapEventData_X1_
+/* 8001B850 00018790  48 02 7C B1 */ bl searchMapEventData__14dEvt_control_cFUcl
 /* 8001B854 00018794  28 03 00 00 */ cmplwi r3, 0
 /* 8001B858 00018798  41 82 00 28 */ beq lbl_8001B880
 /* 8001B85C 0001879C  8B C3 00 06 */ lbz r30, 6(r3)
@@ -52,7 +52,7 @@ lbl_8001B84C:
 /* 8001B86C 000187AC  38 77 4F F8 */ addi r3, r23, 0x4ff8
 /* 8001B870 000187B0  7F 04 C3 78 */ mr r4, r24
 /* 8001B874 000187B4  7F 25 CB 78 */ mr r5, r25
-/* 8001B878 000187B8  48 02 BE 21 */ bl dEvent_manager_c_NS_getEventIdx_X1_
+/* 8001B878 000187B8  48 02 BE 21 */ bl getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc
 /* 8001B87C 000187BC  7C 7A 1B 78 */ mr r26, r3
 lbl_8001B880:
 /* 8001B880 000187C0  57 80 05 EF */ rlwinm. r0, r28, 0, 0x17, 0x17
@@ -74,7 +74,7 @@ lbl_8001B898:
 /* 8001B8B8 000187F8  7F 67 DB 78 */ mr r7, r27
 /* 8001B8BC 000187FC  7F 08 C3 78 */ mr r8, r24
 /* 8001B8C0 00018800  7F 4A D3 78 */ mr r10, r26
-/* 8001B8C4 00018804  48 02 5D A5 */ bl dEvt_control_c_NS_order
+/* 8001B8C4 00018804  48 02 5D A5 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
 lbl_8001B8C8:
 /* 8001B8C8 00018808  39 61 00 40 */ addi r11, r1, 0x40
 /* 8001B8CC 0001880C  48 34 69 45 */ bl _restgpr_23
@@ -46,7 +46,7 @@ lbl_8001B984:
 /* 8001B9A8 000188E8  7F A7 EB 78 */ mr r7, r29
 /* 8001B9AC 000188EC  7F 68 DB 78 */ mr r8, r27
 /* 8001B9B0 000188F0  39 40 FF FF */ li r10, -1
-/* 8001B9B4 000188F4  48 02 5C B5 */ bl dEvt_control_c_NS_order
+/* 8001B9B4 000188F4  48 02 5C B5 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
 lbl_8001B9B8:
 /* 8001B9B8 000188F8  39 61 00 30 */ addi r11, r1, 0x30
 /* 8001B9BC 000188FC  48 34 68 65 */ bl _restgpr_27
@@ -41,7 +41,7 @@ lbl_8001BA40:
 /* 8001BA5C 0001899C  39 08 61 C0 */ addi r8, r8, g_dComIfG_gameInfo@l
 /* 8001BA60 000189A0  81 08 5D AC */ lwz r8, 0x5dac(r8)
 /* 8001BA64 000189A4  39 40 FF FF */ li r10, -1
-/* 8001BA68 000189A8  48 02 5C 01 */ bl dEvt_control_c_NS_order
+/* 8001BA68 000189A8  48 02 5C 01 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
 lbl_8001BA6C:
 /* 8001BA6C 000189AC  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001BA70 000189B0  7C 08 03 A6 */ mtlr r0
@@ -36,7 +36,7 @@ lbl_8001BAE8:
 /* 8001BAF4 00018A34  3C E0 00 01 */ lis r7, 0x0000FFFF@ha
 /* 8001BAF8 00018A38  38 E7 FF FF */ addi r7, r7, 0x0000FFFF@l
 /* 8001BAFC 00018A3C  39 40 FF FF */ li r10, -1
-/* 8001BB00 00018A40  48 02 5B 69 */ bl dEvt_control_c_NS_order
+/* 8001BB00 00018A40  48 02 5B 69 */ bl order__14dEvt_control_cFUsUsUsUsPvPvsUc
 lbl_8001BB04:
 /* 8001BB04 00018A44  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001BB08 00018A48  7C 08 03 A6 */ mtlr r0
@@ -5,7 +5,7 @@
 /* 8001BB24 00018A64  38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
 /* 8001BB28 00018A68  38 64 4E C8 */ addi r3, r4, 0x4ec8
 /* 8001BB2C 00018A6C  80 84 4F 94 */ lwz r4, 0x4f94(r4)
-/* 8001BB30 00018A70  48 02 77 BD */ bl dEvt_control_c_NS_convPId
+/* 8001BB30 00018A70  48 02 77 BD */ bl convPId__14dEvt_control_cFUi
 /* 8001BB34 00018A74  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001BB38 00018A78  7C 08 03 A6 */ mtlr r0
 /* 8001BB3C 00018A7C  38 21 00 10 */ addi r1, r1, 0x10
@@ -5,7 +5,7 @@
 /* 8001BB54 00018A94  38 83 61 C0 */ addi r4, r3, g_dComIfG_gameInfo@l
 /* 8001BB58 00018A98  38 64 4E C8 */ addi r3, r4, 0x4ec8
 /* 8001BB5C 00018A9C  80 84 4F 98 */ lwz r4, 0x4f98(r4)
-/* 8001BB60 00018AA0  48 02 77 8D */ bl dEvt_control_c_NS_convPId
+/* 8001BB60 00018AA0  48 02 77 8D */ bl convPId__14dEvt_control_cFUi
 /* 8001BB64 00018AA4  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001BB68 00018AA8  7C 08 03 A6 */ mtlr r0
 /* 8001BB6C 00018AAC  38 21 00 10 */ addi r1, r1, 0x10
@@ -9,19 +9,19 @@
 /* 8001BB94 00018AD4  3B DF 4E C8 */ addi r30, r31, 0x4ec8
 /* 8001BB98 00018AD8  7F C3 F3 78 */ mr r3, r30
 /* 8001BB9C 00018ADC  80 9F 4F 8C */ lwz r4, 0x4f8c(r31)
-/* 8001BBA0 00018AE0  48 02 77 4D */ bl dEvt_control_c_NS_convPId
+/* 8001BBA0 00018AE0  48 02 77 4D */ bl convPId__14dEvt_control_cFUi
 /* 8001BBA4 00018AE4  7C 03 E8 40 */ cmplw r3, r29
 /* 8001BBA8 00018AE8  41 82 00 14 */ beq lbl_8001BBBC
 /* 8001BBAC 00018AEC  7F C3 F3 78 */ mr r3, r30
 /* 8001BBB0 00018AF0  80 9F 4F 8C */ lwz r4, 0x4f8c(r31)
-/* 8001BBB4 00018AF4  48 02 77 39 */ bl dEvt_control_c_NS_convPId
+/* 8001BBB4 00018AF4  48 02 77 39 */ bl convPId__14dEvt_control_cFUi
 /* 8001BBB8 00018AF8  48 00 00 18 */ b lbl_8001BBD0
 lbl_8001BBBC:
 /* 8001BBBC 00018AFC  7F C3 F3 78 */ mr r3, r30
 /* 8001BBC0 00018B00  3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha
 /* 8001BBC4 00018B04  38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l
 /* 8001BBC8 00018B08  80 84 4F 90 */ lwz r4, 0x4f90(r4)
-/* 8001BBCC 00018B0C  48 02 77 21 */ bl dEvt_control_c_NS_convPId
+/* 8001BBCC 00018B0C  48 02 77 21 */ bl convPId__14dEvt_control_cFUi
 lbl_8001BBD0:
 /* 8001BBD0 00018B10  39 61 00 20 */ addi r11, r1, 0x20
 /* 8001BBD4 00018B14  48 34 66 55 */ bl _restgpr_29
@@ -14,7 +14,7 @@
 /* 8001BC1C 00018B5C  38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
 /* 8001BC20 00018B60  38 63 4E C8 */ addi r3, r3, 0x4ec8
 /* 8001BC24 00018B64  54 84 06 3E */ clrlwi r4, r4, 0x18
-/* 8001BC28 00018B68  48 02 7A FD */ bl dEvt_control_c_NS_setGtItm
+/* 8001BC28 00018B68  48 02 7A FD */ bl setGtItm__14dEvt_control_cFUc
 /* 8001BC2C 00018B6C  2C 1A 00 FF */ cmpwi r26, 0xff
 /* 8001BC30 00018B70  40 82 00 0C */ bne lbl_8001BC3C
 /* 8001BC34 00018B74  38 60 FF FF */ li r3, -1
@@ -13,7 +13,7 @@
 /* 8001BCA4 00018BE4  38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
 /* 8001BCA8 00018BE8  38 63 4E C8 */ addi r3, r3, 0x4ec8
 /* 8001BCAC 00018BEC  54 84 06 3E */ clrlwi r4, r4, 0x18
-/* 8001BCB0 00018BF0  48 02 7A 75 */ bl dEvt_control_c_NS_setGtItm
+/* 8001BCB0 00018BF0  48 02 7A 75 */ bl setGtItm__14dEvt_control_cFUc
 /* 8001BCB4 00018BF4  2C 1B 00 FF */ cmpwi r27, 0xff
 /* 8001BCB8 00018BF8  40 82 00 0C */ bne lbl_8001BCC4
 /* 8001BCBC 00018BFC  38 60 FF FF */ li r3, -1
@@ -33,7 +33,7 @@
 lbl_8001CA94:
 /* 8001CA94 000199D4  80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13)
 /* 8001CA98 000199D8  80 9F 00 B4 */ lwz r4, 0xb4(r31)
-/* 8001CA9C 000199DC  48 00 3B B1 */ bl fpcBs_Is_JustOfType
+/* 8001CA9C 000199DC  48 00 3B B1 */ bl fpcBs_Is_JustOfType__Fii
 /* 8001CAA0 000199E0  2C 03 00 00 */ cmpwi r3, 0
 /* 8001CAA4 000199E4  41 82 00 0C */ beq lbl_8001CAB0
 /* 8001CAA8 000199E8  80 7F 00 C8 */ lwz r3, 0xc8(r31)
@@ -7,7 +7,7 @@
 /* 8001CC74 00019BB4  93 C1 00 28 */ stw r30, 0x28(r1)
 /* 8001CC78 00019BB8  7C 7E 1B 78 */ mr r30, r3
 /* 8001CC7C 00019BBC  FF E0 08 90 */ fmr f31, f1
-/* 8001CC80 00019BC0  48 18 B7 F5 */ bl dKy_Sound_get
+/* 8001CC80 00019BC0  48 18 B7 F5 */ bl dKy_Sound_get__Fv
 /* 8001CC84 00019BC4  7C 7F 1B 78 */ mr r31, r3
 /* 8001CC88 00019BC8  80 63 00 14 */ lwz r3, 0x14(r3)
 /* 8001CC8C 00019BCC  3C 03 00 01 */ addis r0, r3, 1
@@ -6,7 +6,7 @@
 /* 8001CE10 00019D50  7C 7E 1B 78 */ mr r30, r3
 /* 8001CE14 00019D54  7C 9F 23 78 */ mr r31, r4
 /* 8001CE18 00019D58  38 61 00 20 */ addi r3, r1, 0x20
-/* 8001CE1C 00019D5C  48 05 AE 4D */ bl dBgS_LinChk
+/* 8001CE1C 00019D5C  48 05 AE 4D */ bl __ct__11dBgS_LinChkFv
 /* 8001CE20 00019D60  C0 1F 04 D0 */ lfs f0, 0x4d0(r31)
 /* 8001CE24 00019D64  D0 01 00 08 */ stfs f0, 8(r1)
 /* 8001CE28 00019D68  C0 3F 04 D4 */ lfs f1, 0x4d4(r31)
@@ -28,23 +28,23 @@
 /* 8001CE68 00019DA8  38 81 00 14 */ addi r4, r1, 0x14
 /* 8001CE6C 00019DAC  38 A1 00 08 */ addi r5, r1, 8
 /* 8001CE70 00019DB0  7F C6 F3 78 */ mr r6, r30
-/* 8001CE74 00019DB4  48 05 AE F1 */ bl dBgS_LinChk_NS_Set
+/* 8001CE74 00019DB4  48 05 AE F1 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c
 /* 8001CE78 00019DB8  3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
 /* 8001CE7C 00019DBC  38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
 /* 8001CE80 00019DC0  38 63 0F 38 */ addi r3, r3, 0xf38
 /* 8001CE84 00019DC4  38 81 00 20 */ addi r4, r1, 0x20
-/* 8001CE88 00019DC8  48 05 75 2D */ bl cBgS_NS_LineCross
+/* 8001CE88 00019DC8  48 05 75 2D */ bl LineCross__4cBgSFP11cBgS_LinChk
 /* 8001CE8C 00019DCC  54 60 06 3F */ clrlwi. r0, r3, 0x18
 /* 8001CE90 00019DD0  41 82 00 18 */ beq lbl_8001CEA8
 /* 8001CE94 00019DD4  38 61 00 20 */ addi r3, r1, 0x20
 /* 8001CE98 00019DD8  38 80 FF FF */ li r4, -1
-/* 8001CE9C 00019DDC  48 05 AE 41 */ bl dBgS_LinChk_NS_dtor
+/* 8001CE9C 00019DDC  48 05 AE 41 */ bl __dt__11dBgS_LinChkFv
 /* 8001CEA0 00019DE0  38 60 00 01 */ li r3, 1
 /* 8001CEA4 00019DE4  48 00 00 14 */ b lbl_8001CEB8
 lbl_8001CEA8:
 /* 8001CEA8 00019DE8  38 61 00 20 */ addi r3, r1, 0x20
 /* 8001CEAC 00019DEC  38 80 FF FF */ li r4, -1
-/* 8001CEB0 00019DF0  48 05 AE 2D */ bl dBgS_LinChk_NS_dtor
+/* 8001CEB0 00019DF0  48 05 AE 2D */ bl __dt__11dBgS_LinChkFv
 /* 8001CEB4 00019DF4  38 60 00 00 */ li r3, 0
 lbl_8001CEB8:
 /* 8001CEB8 00019DF8  83 E1 00 9C */ lwz r31, 0x9c(r1)
@@ -10,7 +10,7 @@
 /* 8001CEF4 00019E34  FF C0 08 90 */ fmr f30, f1
 /* 8001CEF8 00019E38  FF E0 10 90 */ fmr f31, f2
 /* 8001CEFC 00019E3C  38 61 00 2C */ addi r3, r1, 0x2c
-/* 8001CF00 00019E40  48 05 AD 69 */ bl dBgS_LinChk
+/* 8001CF00 00019E40  48 05 AD 69 */ bl __ct__11dBgS_LinChkFv
 /* 8001CF04 00019E44  C0 1F 04 D0 */ lfs f0, 0x4d0(r31)
 /* 8001CF08 00019E48  D0 01 00 14 */ stfs f0, 0x14(r1)
 /* 8001CF0C 00019E4C  C0 3F 04 D4 */ lfs f1, 0x4d4(r31)
@@ -21,7 +21,7 @@
 /* 8001CF20 00019E60  D0 01 00 18 */ stfs f0, 0x18(r1)
 /* 8001CF24 00019E64  80 6D 81 E8 */ lwz r3, lbl_80450768-_SDA_BASE_(r13)
 /* 8001CF28 00019E68  A8 9F 04 E6 */ lha r4, 0x4e6(r31)
-/* 8001CF2C 00019E6C  4B FE F4 B1 */ bl mDoMtx_YrotS
+/* 8001CF2C 00019E6C  4B FE F4 B1 */ bl mDoMtx_YrotS__FPA4_fs
 /* 8001CF30 00019E70  C0 02 82 04 */ lfs f0, lbl_80451C04-_SDA2_BASE_(r2)
 /* 8001CF34 00019E74  D0 01 00 20 */ stfs f0, 0x20(r1)
 /* 8001CF38 00019E78  C0 02 82 4C */ lfs f0, lbl_80451C4C-_SDA2_BASE_(r2)
@@ -38,23 +38,23 @@
 /* 8001CF64 00019EA4  38 81 00 14 */ addi r4, r1, 0x14
 /* 8001CF68 00019EA8  38 A1 00 08 */ addi r5, r1, 8
 /* 8001CF6C 00019EAC  7F E6 FB 78 */ mr r6, r31
-/* 8001CF70 00019EB0  48 05 AD F5 */ bl dBgS_LinChk_NS_Set
+/* 8001CF70 00019EB0  48 05 AD F5 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c
 /* 8001CF74 00019EB4  3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
 /* 8001CF78 00019EB8  38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
 /* 8001CF7C 00019EBC  38 63 0F 38 */ addi r3, r3, 0xf38
 /* 8001CF80 00019EC0  38 81 00 2C */ addi r4, r1, 0x2c
-/* 8001CF84 00019EC4  48 05 74 31 */ bl cBgS_NS_LineCross
+/* 8001CF84 00019EC4  48 05 74 31 */ bl LineCross__4cBgSFP11cBgS_LinChk
 /* 8001CF88 00019EC8  54 60 06 3F */ clrlwi. r0, r3, 0x18
 /* 8001CF8C 00019ECC  41 82 00 18 */ beq lbl_8001CFA4
 /* 8001CF90 00019ED0  38 61 00 2C */ addi r3, r1, 0x2c
 /* 8001CF94 00019ED4  38 80 FF FF */ li r4, -1
-/* 8001CF98 00019ED8  48 05 AD 45 */ bl dBgS_LinChk_NS_dtor
+/* 8001CF98 00019ED8  48 05 AD 45 */ bl __dt__11dBgS_LinChkFv
 /* 8001CF9C 00019EDC  38 60 00 01 */ li r3, 1
 /* 8001CFA0 00019EE0  48 00 00 14 */ b lbl_8001CFB4
 lbl_8001CFA4:
 /* 8001CFA4 00019EE4  38 61 00 2C */ addi r3, r1, 0x2c
 /* 8001CFA8 00019EE8  38 80 FF FF */ li r4, -1
-/* 8001CFAC 00019EEC  48 05 AD 31 */ bl dBgS_LinChk_NS_dtor
+/* 8001CFAC 00019EEC  48 05 AD 31 */ bl __dt__11dBgS_LinChkFv
 /* 8001CFB0 00019EF0  38 60 00 00 */ li r3, 0
 lbl_8001CFB4:
 /* 8001CFB4 00019EF4  E3 E1 00 C8 */ psq_l f31, 200(r1), 0, 0
@@ -47,7 +47,7 @@
 /* 8001D0D8 0001A018  7F C8 F3 78 */ mr r8, r30
 /* 8001D0DC 0001A01C  7F E9 FB 78 */ mr r9, r31
 /* 8001D0E0 0001A020  7F AA EB 78 */ mr r10, r29
-/* 8001D0E4 0001A024  48 03 06 E1 */ bl dPa_control_c_NS_setSimpleFoot
+/* 8001D0E4 0001A024  48 03 06 E1 */ bl setSimpleFoot__13dPa_control_cFUlPUlR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_ciPC5csXyzPC4cXyzP18dPa_levelEcallBackScPC4cXyz
 /* 8001D0E8 0001A028  90 7B 00 00 */ stw r3, 0(r27)
 lbl_8001D0EC:
 /* 8001D0EC 0001A02C  E3 E1 00 58 */ psq_l f31, 88(r1), 0, 0
@@ -36,12 +36,12 @@ lbl_8001D150:
 /* 8001D190 0001A0D0  39 20 00 00 */ li r9, 0
 /* 8001D194 0001A0D4  39 41 00 20 */ addi r10, r1, 0x20
 /* 8001D198 0001A0D8  C0 22 82 38 */ lfs f1, lbl_80451C38(r2)
-/* 8001D19C 0001A0DC  48 03 03 31 */ bl dPa_control_c_NS_set_X1_
+/* 8001D19C 0001A0DC  48 03 03 31 */ bl set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
 /* 8001D1A0 0001A0E0  90 7B 00 00 */ stw r3, 0(r27)
 /* 8001D1A4 0001A0E4  80 7E 5D 3C */ lwz r3, 0x5d3c(r30)
 /* 8001D1A8 0001A0E8  38 63 02 10 */ addi r3, r3, 0x210
 /* 8001D1AC 0001A0EC  80 9B 00 00 */ lwz r4, 0(r27)
-/* 8001D1B0 0001A0F0  48 02 E7 69 */ bl dPa_control_c_NS_level_c_NS_getEmitter
+/* 8001D1B0 0001A0F0  48 02 E7 69 */ bl getEmitter__Q213dPa_control_c7level_cFUl
 /* 8001D1B4 0001A0F4  28 03 00 00 */ cmplwi r3, 0
 /* 8001D1B8 0001A0F8  41 82 00 08 */ beq lbl_8001D1C0
 /* 8001D1BC 0001A0FC  D3 E3 00 28 */ stfs f31, 0x28(r3)
@@ -8,7 +8,7 @@
 /* 8001D218 0001A158  38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
 /* 8001D21C 0001A15C  83 E3 5D AC */ lwz r31, 0x5dac(r3)
 /* 8001D220 0001A160  38 61 00 2C */ addi r3, r1, 0x2c
-/* 8001D224 0001A164  48 05 AA 45 */ bl dBgS_LinChk
+/* 8001D224 0001A164  48 05 AA 45 */ bl __ct__11dBgS_LinChkFv
 /* 8001D228 0001A168  C0 1F 04 D0 */ lfs f0, 0x4d0(r31)
 /* 8001D22C 0001A16C  D0 01 00 14 */ stfs f0, 0x14(r1)
 /* 8001D230 0001A170  C0 1F 04 D4 */ lfs f0, 0x4d4(r31)
@@ -19,7 +19,7 @@
 /* 8001D244 0001A184  D0 01 00 18 */ stfs f0, 0x18(r1)
 /* 8001D248 0001A188  80 6D 81 E8 */ lwz r3, lbl_80450768-_SDA_BASE_(r13)
 /* 8001D24C 0001A18C  A8 9F 04 E6 */ lha r4, 0x4e6(r31)
-/* 8001D250 0001A190  4B FE F1 8D */ bl mDoMtx_YrotS
+/* 8001D250 0001A190  4B FE F1 8D */ bl mDoMtx_YrotS__FPA4_fs
 /* 8001D254 0001A194  C0 02 82 04 */ lfs f0, lbl_80451C04-_SDA2_BASE_(r2)
 /* 8001D258 0001A198  D0 01 00 20 */ stfs f0, 0x20(r1)
 /* 8001D25C 0001A19C  C0 3E 04 D4 */ lfs f1, 0x4d4(r30)
@@ -39,12 +39,12 @@
 /* 8001D294 0001A1D4  38 81 00 14 */ addi r4, r1, 0x14
 /* 8001D298 0001A1D8  38 A1 00 08 */ addi r5, r1, 8
 /* 8001D29C 0001A1DC  7F C6 F3 78 */ mr r6, r30
-/* 8001D2A0 0001A1E0  48 05 AA C5 */ bl dBgS_LinChk_NS_Set
+/* 8001D2A0 0001A1E0  48 05 AA C5 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c
 /* 8001D2A4 0001A1E4  3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
 /* 8001D2A8 0001A1E8  38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
 /* 8001D2AC 0001A1EC  38 63 0F 38 */ addi r3, r3, 0xf38
 /* 8001D2B0 0001A1F0  38 81 00 2C */ addi r4, r1, 0x2c
-/* 8001D2B4 0001A1F4  48 05 71 01 */ bl cBgS_NS_LineCross
+/* 8001D2B4 0001A1F4  48 05 71 01 */ bl LineCross__4cBgSFP11cBgS_LinChk
 /* 8001D2B8 0001A1F8  54 60 06 3F */ clrlwi. r0, r3, 0x18
 /* 8001D2BC 0001A1FC  41 82 00 48 */ beq lbl_8001D304
 /* 8001D2C0 0001A200  C0 1F 04 D0 */ lfs f0, 0x4d0(r31)
@@ -61,13 +61,13 @@
 /* 8001D2EC 0001A22C  D0 1E 05 2C */ stfs f0, 0x52c(r30)
 /* 8001D2F0 0001A230  38 61 00 2C */ addi r3, r1, 0x2c
 /* 8001D2F4 0001A234  38 80 FF FF */ li r4, -1
-/* 8001D2F8 0001A238  48 05 A9 E5 */ bl dBgS_LinChk_NS_dtor
+/* 8001D2F8 0001A238  48 05 A9 E5 */ bl __dt__11dBgS_LinChkFv
 /* 8001D2FC 0001A23C  38 60 00 01 */ li r3, 1
 /* 8001D300 0001A240  48 00 00 14 */ b lbl_8001D314
 lbl_8001D304:
 /* 8001D304 0001A244  38 61 00 2C */ addi r3, r1, 0x2c
 /* 8001D308 0001A248  38 80 FF FF */ li r4, -1
-/* 8001D30C 0001A24C  48 05 A9 D1 */ bl dBgS_LinChk_NS_dtor
+/* 8001D30C 0001A24C  48 05 A9 D1 */ bl __dt__11dBgS_LinChkFv
 /* 8001D310 0001A250  38 60 00 00 */ li r3, 0
 lbl_8001D314:
 /* 8001D314 0001A254  83 E1 00 AC */ lwz r31, 0xac(r1)
@@ -6,7 +6,7 @@
 /* 8001D440 0001A380  7C 7B 1B 78 */ mr r27, r3
 /* 8001D444 0001A384  7C 9F 23 78 */ mr r31, r4
 /* 8001D448 0001A388  3B BB 05 38 */ addi r29, r27, 0x538
-/* 8001D44C 0001A38C  48 16 41 E5 */ bl dCam_getCamera
+/* 8001D44C 0001A38C  48 16 41 E5 */ bl dCam_getCamera__Fv
 /* 8001D450 0001A390  7C 65 1B 78 */ mr r5, r3
 /* 8001D454 0001A394  38 61 00 08 */ addi r3, r1, 8
 /* 8001D458 0001A398  7F A4 EB 78 */ mr r4, r29
@@ -81,7 +81,7 @@ lbl_8001D538:
 /* 8001D564 0001A4A4  48 00 00 0C */ b lbl_8001D570
 lbl_8001D568:
 /* 8001D568 0001A4A8  38 81 00 38 */ addi r4, r1, 0x38
-/* 8001D56C 0001A4AC  48 30 82 29 */ bl J3DTexMtxInfo_NS_setEffectMtx
+/* 8001D56C 0001A4AC  48 30 82 29 */ bl setEffectMtx__13J3DTexMtxInfoFPA4_f
 lbl_8001D570:
 /* 8001D570 0001A4B0  3B 7B 00 01 */ addi r27, r27, 1
 /* 8001D574 0001A4B4  28 1B 00 08 */ cmplwi r27, 8
@@ -11,7 +11,7 @@
 lbl_8001D614:
 /* 8001D614 0001A554  38 60 FF FF */ li r3, -1
 lbl_8001D618:
-/* 8001D618 0001A558  48 00 3D 85 */ bl fpcEx_IsExist
+/* 8001D618 0001A558  48 00 3D 85 */ bl fpcEx_IsExist__FUi
 /* 8001D61C 0001A55C  2C 03 00 00 */ cmpwi r3, 0
 /* 8001D620 0001A560  40 82 00 0C */ bne lbl_8001D62C
 /* 8001D624 0001A564  38 60 00 00 */ li r3, 0
@@ -3,7 +3,7 @@
 /* 8001D6A0 0001A5E0  90 01 00 24 */ stw r0, 0x24(r1)
 /* 8001D6A4 0001A5E4  90 81 00 08 */ stw r4, 8(r1)
 /* 8001D6A8 0001A5E8  90 A1 00 0C */ stw r5, 0xc(r1)
-/* 8001D6AC 0001A5EC  48 00 77 15 */ bl dStage_searchName
+/* 8001D6AC 0001A5EC  48 00 77 15 */ bl dStage_searchName__FPCc
 /* 8001D6B0 0001A5F0  28 03 00 00 */ cmplwi r3, 0
 /* 8001D6B4 0001A5F4  40 82 00 0C */ bne lbl_8001D6C0
 /* 8001D6B8 0001A5F8  38 60 00 00 */ li r3, 0
@@ -13,7 +13,7 @@
 lbl_8001D720:
 /* 8001D720 0001A660  38 60 FF FF */ li r3, -1
 lbl_8001D724:
-/* 8001D724 0001A664  48 00 3C 79 */ bl fpcEx_IsExist
+/* 8001D724 0001A664  48 00 3C 79 */ bl fpcEx_IsExist__FUi
 /* 8001D728 0001A668  2C 03 00 00 */ cmpwi r3, 0
 /* 8001D72C 0001A66C  40 82 00 0C */ bne lbl_8001D738
 lbl_8001D730:
@@ -46,7 +46,7 @@ lbl_8001D83C:
 /* 8001D844 0001A784  40 82 FF C0 */ bne lbl_8001D804
 lbl_8001D848:
 /* 8001D848 0001A788  38 61 00 08 */ addi r3, r1, 8
-/* 8001D84C 0001A78C  48 00 75 75 */ bl dStage_searchName
+/* 8001D84C 0001A78C  48 00 75 75 */ bl dStage_searchName__FPCc
 /* 8001D850 0001A790  28 03 00 00 */ cmplwi r3, 0
 /* 8001D854 0001A794  40 82 00 0C */ bne lbl_8001D860
 /* 8001D858 0001A798  38 60 00 00 */ li r3, 0
@@ -11,7 +11,7 @@
 /* 8001D8B8 0001A7F8  38 63 0F 38 */ addi r3, r3, 0xf38
 /* 8001D8BC 0001A7FC  3C 80 80 3F */ lis r4, lbl_803F1D80@ha
 /* 8001D8C0 0001A800  38 84 1D 80 */ addi r4, r4, lbl_803F1D80@l
-/* 8001D8C4 0001A804  48 05 75 8D */ bl dBgS_NS_GetPolyAtt0
+/* 8001D8C4 0001A804  48 05 75 8D */ bl GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo
 /* 8001D8C8 0001A808  2C 03 00 06 */ cmpwi r3, 6
 /* 8001D8CC 0001A80C  41 82 00 14 */ beq lbl_8001D8E0
 /* 8001D8D0 0001A810  C0 0D 87 58 */ lfs f0, lbl_80450CD8-_SDA_BASE_(r13)
@@ -25,7 +25,7 @@ lbl_8001D9E4:
 lbl_8001DA04:
 /* 8001DA04 0001A944  7F E3 FB 78 */ mr r3, r31
 /* 8001DA08 0001A948  7F 44 D3 78 */ mr r4, r26
-/* 8001DA0C 0001A94C  48 01 3E A9 */ bl daTagStream_c_NS_checkArea
+/* 8001DA0C 0001A94C  48 01 3E A9 */ bl checkArea__13daTagStream_cFPC4cXyz
 /* 8001DA10 0001A950  2C 03 00 00 */ cmpwi r3, 0
 /* 8001DA14 0001A954  41 82 00 2C */ beq lbl_8001DA40
 /* 8001DA18 0001A958  C0 1F 04 F8 */ lfs f0, 0x4f8(r31)
@@ -53,13 +53,13 @@ lbl_8001DA5C:
 /* 8001DA60 0001A9A0  38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
 /* 8001DA64 0001A9A4  38 63 0F 38 */ addi r3, r3, 0xf38
 /* 8001DA68 0001A9A8  7F 64 DB 78 */ mr r4, r27
-/* 8001DA6C 0001A9AC  48 05 6B F5 */ bl cBgS_NS_ChkPolySafe
+/* 8001DA6C 0001A9AC  48 05 6B F5 */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo
 /* 8001DA70 0001A9B0  54 60 06 3F */ clrlwi. r0, r3, 0x18
 /* 8001DA74 0001A9B4  41 82 00 30 */ beq lbl_8001DAA4
 /* 8001DA78 0001A9B8  7F 63 DB 78 */ mr r3, r27
 /* 8001DA7C 0001A9BC  7F 84 E3 78 */ mr r4, r28
 /* 8001DA80 0001A9C0  7F A5 EB 78 */ mr r5, r29
-/* 8001DA84 0001A9C4  48 03 3E D9 */ bl dPath_GetPolyRoomPathVec
+/* 8001DA84 0001A9C4  48 03 3E D9 */ bl dPath_GetPolyRoomPathVec__FRC13cBgS_PolyInfoP4cXyzPi
 /* 8001DA88 0001A9C8  54 60 06 3F */ clrlwi. r0, r3, 0x18
 /* 8001DA8C 0001A9CC  41 82 00 3C */ beq lbl_8001DAC8
 /* 8001DA90 0001A9D0  38 61 00 08 */ addi r3, r1, 8
@@ -10,7 +10,7 @@
 /* 8001DB08 0001AA48  3B E3 0F 38 */ addi r31, r3, 0xf38
 /* 8001DB0C 0001AA4C  7F E3 FB 78 */ mr r3, r31
 /* 8001DB10 0001AA50  7F A4 EB 78 */ mr r4, r29
-/* 8001DB14 0001AA54  48 05 6B 4D */ bl cBgS_NS_ChkPolySafe
+/* 8001DB14 0001AA54  48 05 6B 4D */ bl ChkPolySafe__4cBgSFRC13cBgS_PolyInfo
 /* 8001DB18 0001AA58  54 60 06 3F */ clrlwi. r0, r3, 0x18
 /* 8001DB1C 0001AA5C  40 82 00 0C */ bne lbl_8001DB28
 /* 8001DB20 0001AA60  38 60 00 00 */ li r3, 0
@@ -22,7 +22,7 @@ lbl_8001DB28:
 /* 8001DB34 0001AA74  7F E3 FB 78 */ mr r3, r31
 /* 8001DB38 0001AA78  7F A4 EB 78 */ mr r4, r29
 /* 8001DB3C 0001AA7C  38 A1 00 08 */ addi r5, r1, 8
-/* 8001DB40 0001AA80  48 05 6C 05 */ bl cBgS_NS_GetTriPla
+/* 8001DB40 0001AA80  48 05 6C 05 */ bl GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla
 /* 8001DB44 0001AA84  54 60 06 3F */ clrlwi. r0, r3, 0x18
 /* 8001DB48 0001AA88  40 82 00 18 */ bne lbl_8001DB60
 /* 8001DB4C 0001AA8C  3C 60 80 3A */ lis r3, lbl_803A37C0@ha
@@ -8,13 +8,13 @@
 /* 8001DC84 0001ABC4  38 63 1C 48 */ addi r3, r3, lbl_803F1C48@l
 /* 8001DC88 0001ABC8  7C E4 3B 78 */ mr r4, r7
 /* 8001DC8C 0001ABCC  7C 05 03 78 */ mr r5, r0
-/* 8001DC90 0001ABD0  48 05 A0 D5 */ bl dBgS_LinChk_NS_Set
+/* 8001DC90 0001ABD0  48 05 A0 D5 */ bl Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c
 /* 8001DC94 0001ABD4  3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
 /* 8001DC98 0001ABD8  38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
 /* 8001DC9C 0001ABDC  38 63 0F 38 */ addi r3, r3, 0xf38
 /* 8001DCA0 0001ABE0  3C 80 80 3F */ lis r4, lbl_803F1C48@ha
 /* 8001DCA4 0001ABE4  38 84 1C 48 */ addi r4, r4, lbl_803F1C48@l
-/* 8001DCA8 0001ABE8  48 05 67 0D */ bl cBgS_NS_LineCross
+/* 8001DCA8 0001ABE8  48 05 67 0D */ bl LineCross__4cBgSFP11cBgS_LinChk
 /* 8001DCAC 0001ABEC  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001DCB0 0001ABF0  7C 08 03 A6 */ mtlr r0
 /* 8001DCB4 0001ABF4  38 21 00 10 */ addi r1, r1, 0x10
@@ -10,7 +10,7 @@
 /* 8001DCE0 0001AC20  38 63 0F 38 */ addi r3, r3, 0xf38
 /* 8001DCE4 0001AC24  3C 80 80 3F */ lis r4, lbl_803F1CC4@ha
 /* 8001DCE8 0001AC28  38 84 1C C4 */ addi r4, r4, lbl_803F1CC4@l
-/* 8001DCEC 0001AC2C  48 05 67 B5 */ bl cBgS_NS_GroundCross
+/* 8001DCEC 0001AC2C  48 05 67 B5 */ bl GroundCross__4cBgSFP11cBgS_GndChk
 /* 8001DCF0 0001AC30  D0 2D 87 50 */ stfs f1, lbl_80450CD0-_SDA_BASE_(r13)
 /* 8001DCF4 0001AC34  C0 42 82 58 */ lfs f2, lbl_80451C58-_SDA2_BASE_(r2)
 /* 8001DCF8 0001AC38  FC 00 08 18 */ frsp f0, f1
@@ -12,7 +12,7 @@
 /* 8001DD48 0001AC88  3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
 /* 8001DD4C 0001AC8C  38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
 /* 8001DD50 0001AC90  38 63 0F 38 */ addi r3, r3, 0xf38
-/* 8001DD54 0001AC94  48 05 77 49 */ bl dBgS_NS_RoofChk
+/* 8001DD54 0001AC94  48 05 77 49 */ bl RoofChk__4dBgSFP12dBgS_RoofChk
 /* 8001DD58 0001AC98  D0 2D 87 54 */ stfs f1, lbl_80450CD4-_SDA_BASE_(r13)
 /* 8001DD5C 0001AC9C  C0 42 82 5C */ lfs f2, lbl_80451C5C-_SDA2_BASE_(r2)
 /* 8001DD60 0001ACA0  FC 00 08 18 */ frsp f0, f1
@@ -13,13 +13,13 @@
 /* 8001DDB4 0001ACF4  38 63 1D 80 */ addi r3, r3, lbl_803F1D80@l
 /* 8001DDB8 0001ACF8  38 81 00 08 */ addi r4, r1, 8
 /* 8001DDBC 0001ACFC  EC 21 10 2A */ fadds f1, f1, f2
-/* 8001DDC0 0001AD00  48 05 AD D1 */ bl dBgS_SplGrpChk_NS_Set
+/* 8001DDC0 0001AD00  48 05 AD D1 */ bl Set__14dBgS_SplGrpChkFR4cXyzf
 /* 8001DDC4 0001AD04  3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
 /* 8001DDC8 0001AD08  38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l
 /* 8001DDCC 0001AD0C  38 63 0F 38 */ addi r3, r3, 0xf38
 /* 8001DDD0 0001AD10  3C 80 80 3F */ lis r4, lbl_803F1D80@ha
 /* 8001DDD4 0001AD14  38 84 1D 80 */ addi r4, r4, lbl_803F1D80@l
-/* 8001DDD8 0001AD18  48 05 77 8D */ bl dBgS_NS_SplGrpChk
+/* 8001DDD8 0001AD18  48 05 77 8D */ bl SplGrpChk__4dBgSFP14dBgS_SplGrpChk
 /* 8001DDDC 0001AD1C  54 60 06 3F */ clrlwi. r0, r3, 0x18
 /* 8001DDE0 0001AD20  41 82 00 1C */ beq lbl_8001DDFC
 /* 8001DDE4 0001AD24  3C 60 80 3F */ lis r3, lbl_803F1D80@ha
@@ -6,24 +6,24 @@
 /* 8001DE28 0001AD68  3C 60 80 3F */ lis r3, lbl_803F1C00@ha
 /* 8001DE2C 0001AD6C  3B E3 1C 00 */ addi r31, r3, lbl_803F1C00@l
 /* 8001DE30 0001AD70  38 6D 87 4C */ addi r3, r13, 0x80450CCC - 0x80458580 /*SDA HACK; original: lbl_80450CCC-_SDA_BASE_*/
-/*.global l_HIO_NS_dtor*/
-/* 8001DE34 0001AD74  3C 80 80 02 */ lis r4, l_HIO_NS_dtor@ha
-/*.global l_HIO_NS_dtor*/
-/* 8001DE38 0001AD78  38 84 E0 98 */ addi r4, r4, l_HIO_NS_dtor@l
+/*.global __dt__5l_HIOFv*/
+/* 8001DE34 0001AD74  3C 80 80 02 */ lis r4, __dt__5l_HIOFv@ha
+/*.global __dt__5l_HIOFv*/
+/* 8001DE38 0001AD78  38 84 E0 98 */ addi r4, r4, __dt__5l_HIOFv@l
 /* 8001DE3C 0001AD7C  38 BF 00 00 */ addi r5, r31, 0
 /* 8001DE40 0001AD80  48 34 3D E5 */ bl func_80361C24
 /* 8001DE44 0001AD84  38 7F 00 48 */ addi r3, r31, 0x48
 /* 8001DE48 0001AD88  80 03 00 4C */ lwz r0, 0x4c(r3)
 /* 8001DE4C 0001AD8C  54 00 00 C2 */ rlwinm r0, r0, 0, 3, 1
 /* 8001DE50 0001AD90  90 03 00 4C */ stw r0, 0x4c(r3)
-/* 8001DE54 0001AD94  48 05 A1 09 */ bl dBgS_ObjLinChk
-/* 8001DE58 0001AD98  3C 80 80 07 */ lis r4, dBgS_ObjLinChk_NS_dtor@ha
-/* 8001DE5C 0001AD9C  38 84 7F B8 */ addi r4, r4, dBgS_ObjLinChk_NS_dtor@l
+/* 8001DE54 0001AD94  48 05 A1 09 */ bl __ct__14dBgS_ObjLinChkFv
+/* 8001DE58 0001AD98  3C 80 80 07 */ lis r4, __dt__14dBgS_ObjLinChkFv@ha
+/* 8001DE5C 0001AD9C  38 84 7F B8 */ addi r4, r4, __dt__14dBgS_ObjLinChkFv@l
 /* 8001DE60 0001ADA0  38 BF 00 3C */ addi r5, r31, 0x3c
 /* 8001DE64 0001ADA4  48 34 3D C1 */ bl func_80361C24
 /* 8001DE68 0001ADA8  3B DF 00 C4 */ addi r30, r31, 0xc4
 /* 8001DE6C 0001ADAC  7F C3 F3 78 */ mr r3, r30
-/* 8001DE70 0001ADB0  48 05 97 0D */ bl dBgS_GndChk
+/* 8001DE70 0001ADB0  48 05 97 0D */ bl __ct__11dBgS_GndChkFv
 /* 8001DE74 0001ADB4  3C 60 80 3A */ lis r3, lbl_803A382C@ha
 /* 8001DE78 0001ADB8  38 63 38 2C */ addi r3, r3, lbl_803A382C@l
 /* 8001DE7C 0001ADBC  90 7E 00 10 */ stw r3, 0x10(r30)
@@ -36,15 +36,15 @@
 /* 8001DE98 0001ADD8  38 7E 00 3C */ addi r3, r30, 0x3c
 /* 8001DE9C 0001ADDC  48 05 AF CD */ bl SetObj__16dBgS_PolyPassChkFv
 /* 8001DEA0 0001ADE0  7F C3 F3 78 */ mr r3, r30
-/*.global dBgS_ObjGndChk_NS_dtor*/
-/* 8001DEA4 0001ADE4  3C 80 80 02 */ lis r4, dBgS_ObjGndChk_NS_dtor@ha
-/*.global dBgS_ObjGndChk_NS_dtor*/
-/* 8001DEA8 0001ADE8  38 84 E0 20 */ addi r4, r4, dBgS_ObjGndChk_NS_dtor@l
+/*.global __dt__14dBgS_ObjGndChkFv*/
+/* 8001DEA4 0001ADE4  3C 80 80 02 */ lis r4, __dt__14dBgS_ObjGndChkFv@ha
+/*.global __dt__14dBgS_ObjGndChkFv*/
+/* 8001DEA8 0001ADE8  38 84 E0 20 */ addi r4, r4, __dt__14dBgS_ObjGndChkFv@l
 /* 8001DEAC 0001ADEC  38 BF 00 B8 */ addi r5, r31, 0xb8
 /* 8001DEB0 0001ADF0  48 34 3D 75 */ bl func_80361C24
 /* 8001DEB4 0001ADF4  3B DF 01 24 */ addi r30, r31, 0x124
 /* 8001DEB8 0001ADF8  7F C3 F3 78 */ mr r3, r30
-/* 8001DEBC 0001ADFC  48 05 B1 39 */ bl dBgS_RoofChk
+/* 8001DEBC 0001ADFC  48 05 B1 39 */ bl __ct__12dBgS_RoofChkFv
 /* 8001DEC0 0001AE00  3C 60 80 3A */ lis r3, lbl_803A37CC@ha
 /* 8001DEC4 0001AE04  38 63 37 CC */ addi r3, r3, lbl_803A37CC@l
 /* 8001DEC8 0001AE08  90 7E 00 0C */ stw r3, 0xc(r30)
@@ -57,18 +57,18 @@
 /* 8001DEE4 0001AE24  38 7E 00 24 */ addi r3, r30, 0x24
 /* 8001DEE8 0001AE28  48 05 AF 81 */ bl SetObj__16dBgS_PolyPassChkFv
 /* 8001DEEC 0001AE2C  7F C3 F3 78 */ mr r3, r30
-/*.global dBgS_ObjRoofChk_NS_dtor*/
-/* 8001DEF0 0001AE30  3C 80 80 02 */ lis r4, dBgS_ObjRoofChk_NS_dtor@ha
-/*.global dBgS_ObjRoofChk_NS_dtor*/
-/* 8001DEF4 0001AE34  38 84 DF A8 */ addi r4, r4, dBgS_ObjRoofChk_NS_dtor@l
+/*.global __dt__15dBgS_ObjRoofChkFv*/
+/* 8001DEF0 0001AE30  3C 80 80 02 */ lis r4, __dt__15dBgS_ObjRoofChkFv@ha
+/*.global __dt__15dBgS_ObjRoofChkFv*/
+/* 8001DEF4 0001AE34  38 84 DF A8 */ addi r4, r4, __dt__15dBgS_ObjRoofChkFv@l
 /* 8001DEF8 0001AE38  38 BF 01 18 */ addi r5, r31, 0x118
 /* 8001DEFC 0001AE3C  48 34 3D 29 */ bl func_80361C24
 /* 8001DF00 0001AE40  38 7F 01 80 */ addi r3, r31, 0x180
-/* 8001DF04 0001AE44  48 05 B2 61 */ bl dBgS_WtrChk
-/*.global dBgS_WtrChk_NS_dtor*/
-/* 8001DF08 0001AE48  3C 80 80 02 */ lis r4, dBgS_WtrChk_NS_dtor@ha
-/*.global dBgS_WtrChk_NS_dtor*/
-/* 8001DF0C 0001AE4C  38 84 DF 30 */ addi r4, r4, dBgS_WtrChk_NS_dtor@l
+/* 8001DF04 0001AE44  48 05 B2 61 */ bl __ct__11dBgS_WtrChkFv
+/*.global __dt__11dBgS_WtrChkFv*/
+/* 8001DF08 0001AE48  3C 80 80 02 */ lis r4, __dt__11dBgS_WtrChkFv@ha
+/*.global __dt__11dBgS_WtrChkFv*/
+/* 8001DF0C 0001AE4C  38 84 DF 30 */ addi r4, r4, __dt__11dBgS_WtrChkFv@l
 /* 8001DF10 0001AE50  38 BF 01 74 */ addi r5, r31, 0x174
 /* 8001DF14 0001AE54  48 34 3D 11 */ bl func_80361C24
 /* 8001DF18 0001AE58  83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -16,7 +16,7 @@
 /* 8001DF6C 0001AEAC  38 04 00 24 */ addi r0, r4, 0x24
 /* 8001DF70 0001AEB0  90 1E 00 34 */ stw r0, 0x34(r30)
 /* 8001DF74 0001AEB4  38 80 00 00 */ li r4, 0
-/* 8001DF78 0001AEB8  48 05 AD 01 */ bl dBgS_SplGrpChk_NS_dtor
+/* 8001DF78 0001AEB8  48 05 AD 01 */ bl __dt__14dBgS_SplGrpChkFv
 /* 8001DF7C 0001AEBC  7F E0 07 35 */ extsh. r0, r31
 /* 8001DF80 0001AEC0  40 81 00 0C */ ble lbl_8001DF8C
 /* 8001DF84 0001AEC4  7F C3 F3 78 */ mr r3, r30
@@ -16,7 +16,7 @@
 /* 8001DFE4 0001AF24  38 04 00 24 */ addi r0, r4, 0x24
 /* 8001DFE8 0001AF28  90 1E 00 34 */ stw r0, 0x34(r30)
 /* 8001DFEC 0001AF2C  38 80 00 00 */ li r4, 0
-/* 8001DFF0 0001AF30  48 05 B0 A1 */ bl dBgS_RoofChk_NS_dtor
+/* 8001DFF0 0001AF30  48 05 B0 A1 */ bl __dt__12dBgS_RoofChkFv
 /* 8001DFF4 0001AF34  7F E0 07 35 */ extsh. r0, r31
 /* 8001DFF8 0001AF38  40 81 00 0C */ ble lbl_8001E004
 /* 8001DFFC 0001AF3C  7F C3 F3 78 */ mr r3, r30
@@ -16,7 +16,7 @@
 /* 8001E05C 0001AF9C  38 04 00 24 */ addi r0, r4, 0x24
 /* 8001E060 0001AFA0  90 1E 00 4C */ stw r0, 0x4c(r30)
 /* 8001E064 0001AFA4  38 80 00 00 */ li r4, 0
-/* 8001E068 0001AFA8  48 05 95 89 */ bl dBgS_GndChk_NS_dtor
+/* 8001E068 0001AFA8  48 05 95 89 */ bl __dt__11dBgS_GndChkFv
 /* 8001E06C 0001AFAC  7F E0 07 35 */ extsh. r0, r31
 /* 8001E070 0001AFB0  40 81 00 0C */ ble lbl_8001E07C
 /* 8001E074 0001AFB4  7F C3 F3 78 */ mr r3, r30
@@ -1,3 +1,3 @@
 /* 8001E0D4 0001B014  38 63 FF EC */ addi r3, r3, -20
-/*.global dBgS_ObjGndChk_NS_dtor*/
-/* 8001E0D8 0001B018  4B FF FF 48 */ b dBgS_ObjGndChk_NS_dtor
+/*.global __dt__14dBgS_ObjGndChkFv*/
+/* 8001E0D8 0001B018  4B FF FF 48 */ b __dt__14dBgS_ObjGndChkFv
@@ -1,3 +1,3 @@
 /* 8001E0DC 0001B01C  38 63 FF B4 */ addi r3, r3, -76
-/*.global dBgS_ObjGndChk_NS_dtor*/
-/* 8001E0E0 0001B020  4B FF FF 40 */ b dBgS_ObjGndChk_NS_dtor
+/*.global __dt__14dBgS_ObjGndChkFv*/
+/* 8001E0E0 0001B020  4B FF FF 40 */ b __dt__14dBgS_ObjGndChkFv
@@ -1,3 +1,3 @@
 /* 8001E0E4 0001B024  38 63 FF C4 */ addi r3, r3, -60
-/*.global dBgS_ObjGndChk_NS_dtor*/
-/* 8001E0E8 0001B028  4B FF FF 38 */ b dBgS_ObjGndChk_NS_dtor
+/*.global __dt__14dBgS_ObjGndChkFv*/
+/* 8001E0E8 0001B028  4B FF FF 38 */ b __dt__14dBgS_ObjGndChkFv
@@ -1,3 +1,3 @@
 /* 8001E0EC 0001B02C  38 63 FF F0 */ addi r3, r3, -16
-/*.global dBgS_WtrChk_NS_dtor*/
-/* 8001E0F0 0001B030  4B FF FE 40 */ b dBgS_WtrChk_NS_dtor
+/*.global __dt__11dBgS_WtrChkFv*/
+/* 8001E0F0 0001B030  4B FF FE 40 */ b __dt__11dBgS_WtrChkFv
@@ -1,3 +1,3 @@
 /* 8001E0F4 0001B034  38 63 FF CC */ addi r3, r3, -52
-/*.global dBgS_WtrChk_NS_dtor*/
-/* 8001E0F8 0001B038  4B FF FE 38 */ b dBgS_WtrChk_NS_dtor
+/*.global __dt__11dBgS_WtrChkFv*/
+/* 8001E0F8 0001B038  4B FF FE 38 */ b __dt__11dBgS_WtrChkFv
@@ -1,3 +1,3 @@
 /* 8001E0FC 0001B03C  38 63 FF DC */ addi r3, r3, -36
-/*.global dBgS_WtrChk_NS_dtor*/
-/* 8001E100 0001B040  4B FF FE 30 */ b dBgS_WtrChk_NS_dtor
+/*.global __dt__11dBgS_WtrChkFv*/
+/* 8001E100 0001B040  4B FF FE 30 */ b __dt__11dBgS_WtrChkFv
@@ -1,3 +1,3 @@
 /* 8001E104 0001B044  38 63 FF F0 */ addi r3, r3, -16
-/*.global dBgS_ObjRoofChk_NS_dtor*/
-/* 8001E108 0001B048  4B FF FE A0 */ b dBgS_ObjRoofChk_NS_dtor
+/*.global __dt__15dBgS_ObjRoofChkFv*/
+/* 8001E108 0001B048  4B FF FE A0 */ b __dt__15dBgS_ObjRoofChkFv
@@ -1,3 +1,3 @@
 /* 8001E10C 0001B04C  38 63 FF CC */ addi r3, r3, -52
-/*.global dBgS_ObjRoofChk_NS_dtor*/
-/* 8001E110 0001B050  4B FF FE 98 */ b dBgS_ObjRoofChk_NS_dtor
+/*.global __dt__15dBgS_ObjRoofChkFv*/
+/* 8001E110 0001B050  4B FF FE 98 */ b __dt__15dBgS_ObjRoofChkFv
@@ -1,3 +1,3 @@
 /* 8001E114 0001B054  38 63 FF DC */ addi r3, r3, -36
-/*.global dBgS_ObjRoofChk_NS_dtor*/
-/* 8001E118 0001B058  4B FF FE 90 */ b dBgS_ObjRoofChk_NS_dtor
+/*.global __dt__15dBgS_ObjRoofChkFv*/
+/* 8001E118 0001B058  4B FF FE 90 */ b __dt__15dBgS_ObjRoofChkFv
@@ -9,9 +9,9 @@ extern node_list_class lbl_803A35E0;

 extern "C" {

-u32 fopAcTg_ToActorQ(create_tag_class* c);
-u32 fopAcTg_ActorQTo(create_tag_class* c);
-u32 fopAcTg_Init(create_tag_class* c, void* data);
+u32 fopAcTg_ToActorQ__FP16create_tag_class(create_tag_class* c);
+u32 fopAcTg_ActorQTo__FP16create_tag_class(create_tag_class* c);
+u32 fopAcTg_Init__FP16create_tag_classPv(create_tag_class* c, void* data);
 }

 #endif
@@ -11,7 +11,7 @@
 /* 8001E1A8 0001B0E8  7C 00 07 75 */ extsb. r0, r0
 /* 8001E1AC 0001B0EC  40 82 00 0C */ bne lbl_8001E1B8
 /* 8001E1B0 0001B0F0  80 64 02 24 */ lwz r3, 0x224(r4)
-/* 8001E1B4 0001B0F4  48 00 42 AD */ bl fpcMtd_Execute
+/* 8001E1B4 0001B0F4  48 00 42 AD */ bl fpcMtd_Execute__FP20process_method_classPv
 lbl_8001E1B8:
 /* 8001E1B8 0001B0F8  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001E1BC 0001B0FC  7C 08 03 A6 */ mtlr r0
@@ -12,7 +12,7 @@
 /* 8001E29C 0001B1DC  90 1F 02 24 */ stw r0, 0x224(r31)
 /* 8001E2A0 0001B1E0  38 7F 02 10 */ addi r3, r31, 0x210
 /* 8001E2A4 0001B1E4  7F E4 FB 78 */ mr r4, r31
-/* 8001E2A8 0001B1E8  48 00 22 4D */ bl fopDwTg_Init
+/* 8001E2A8 0001B1E8  48 00 22 4D */ bl fopDwTg_Init__FP16create_tag_classPv
 /* 8001E2AC 0001B1EC  80 7F 00 AC */ lwz r3, 0xac(r31)
 /* 8001E2B0 0001B1F0  28 03 00 00 */ cmplwi r3, 0
 /* 8001E2B4 0001B1F4  41 82 00 0C */ beq lbl_8001E2C0
@@ -21,15 +21,15 @@
 lbl_8001E2C0:
 /* 8001E2C0 0001B200  80 7F 02 24 */ lwz r3, 0x224(r31)
 /* 8001E2C4 0001B204  7F E4 FB 78 */ mr r4, r31
-/* 8001E2C8 0001B208  48 00 42 05 */ bl fpcMtd_Create
+/* 8001E2C8 0001B208  48 00 42 05 */ bl fpcMtd_Create__FP20process_method_classPv
 /* 8001E2CC 0001B20C  7C 7E 1B 78 */ mr r30, r3
 /* 8001E2D0 0001B210  2C 1E 00 04 */ cmpwi r30, 4
 /* 8001E2D4 0001B214  40 82 00 18 */ bne lbl_8001E2EC
 /* 8001E2D8 0001B218  7F E3 FB 78 */ mr r3, r31
-/* 8001E2DC 0001B21C  48 00 37 25 */ bl fpcLf_GetPriority
+/* 8001E2DC 0001B21C  48 00 37 25 */ bl fpcLf_GetPriority__FPC14leafdraw_class
 /* 8001E2E0 0001B220  7C 64 07 34 */ extsh r4, r3
 /* 8001E2E4 0001B224  38 7F 02 10 */ addi r3, r31, 0x210
-/* 8001E2E8 0001B228  48 00 21 C5 */ bl fopDwTg_ToDrawQ
+/* 8001E2E8 0001B228  48 00 21 C5 */ bl fopDwTg_ToDrawQ__FP16create_tag_classi
 lbl_8001E2EC:
 /* 8001E2EC 0001B22C  7F C3 F3 78 */ mr r3, r30
 /* 8001E2F0 0001B230  83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -8,7 +8,7 @@
 /* 8001F2A0 0001C1E0  28 00 00 00 */ cmplwi r0, 0
 /* 8001F2A4 0001C1E4  40 82 00 0C */ bne lbl_8001F2B0
 /* 8001F2A8 0001C1E8  80 64 00 D8 */ lwz r3, 0xd8(r4)
-/* 8001F2AC 0001C1EC  48 00 27 79 */ bl fpcLf_DrawMethod
+/* 8001F2AC 0001C1EC  48 00 27 79 */ bl fpcLf_DrawMethod__FP21leafdraw_method_classPv
 lbl_8001F2B0:
 /* 8001F2B0 0001C1F0  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001F2B4 0001C1F4  7C 08 03 A6 */ mtlr r0
@@ -15,7 +15,7 @@
 /* 8001F2F8 0001C238  40 82 00 0C */ bne lbl_8001F304
 lbl_8001F2FC:
 /* 8001F2FC 0001C23C  80 64 00 D8 */ lwz r3, 0xd8(r4)
-/* 8001F300 0001C240  48 00 31 61 */ bl fpcMtd_Execute
+/* 8001F300 0001C240  48 00 31 61 */ bl fpcMtd_Execute__FP20process_method_classPv
 lbl_8001F304:
 /* 8001F304 0001C244  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001F308 0001C248  7C 08 03 A6 */ mtlr r0
@@ -6,7 +6,7 @@
 /* 8001F328 0001C268  7C 7E 1B 78 */ mr r30, r3
 /* 8001F32C 0001C26C  80 63 00 D8 */ lwz r3, 0xd8(r3)
 /* 8001F330 0001C270  7F C4 F3 78 */ mr r4, r30
-/* 8001F334 0001C274  48 00 31 51 */ bl fpcMtd_IsDelete
+/* 8001F334 0001C274  48 00 31 51 */ bl fpcMtd_IsDelete__FP20process_method_classPv
 /* 8001F338 0001C278  7C 7F 1B 78 */ mr r31, r3
 /* 8001F33C 0001C27C  2C 1F 00 01 */ cmpwi r31, 1
 /* 8001F340 0001C280  40 82 00 0C */ bne lbl_8001F34C
@@ -6,7 +6,7 @@
 /* 8001F37C 0001C2BC  7C 7F 1B 78 */ mr r31, r3
 /* 8001F380 0001C2C0  80 63 00 D8 */ lwz r3, 0xd8(r3)
 /* 8001F384 0001C2C4  7F E4 FB 78 */ mr r4, r31
-/* 8001F388 0001C2C8  48 00 31 21 */ bl fpcMtd_Delete
+/* 8001F388 0001C2C8  48 00 31 21 */ bl fpcMtd_Delete__FP20process_method_classPv
 /* 8001F38C 0001C2CC  7C 7E 1B 78 */ mr r30, r3
 /* 8001F390 0001C2D0  38 7F 00 C4 */ addi r3, r31, 0xc4
 /* 8001F394 0001C2D4  48 00 11 41 */ bl fopDwTg_DrawQTo__FP16create_tag_class
@@ -9,13 +9,13 @@
 /* 8001F3D4 0001C314  40 82 00 6C */ bne lbl_8001F440
 /* 8001F3D8 0001C318  83 C3 00 10 */ lwz r30, 0x10(r3)
 /* 8001F3DC 0001C31C  38 6D 87 68 */ la r3, lbl_80450CE8(r13)
-/* 8001F3E0 0001C320  48 00 12 7D */ bl fpcBs_MakeOfType
+/* 8001F3E0 0001C320  48 00 12 7D */ bl fpcBs_MakeOfType__FPi
 /* 8001F3E4 0001C324  90 7F 00 C0 */ stw r3, 0xc0(r31)
 /* 8001F3E8 0001C328  80 1E 00 24 */ lwz r0, 0x24(r30)
 /* 8001F3EC 0001C32C  90 1F 00 D8 */ stw r0, 0xd8(r31)
 /* 8001F3F0 0001C330  38 7F 00 C4 */ addi r3, r31, 0xc4
 /* 8001F3F4 0001C334  7F E4 FB 78 */ mr r4, r31
-/* 8001F3F8 0001C338  48 00 10 FD */ bl fopDwTg_Init
+/* 8001F3F8 0001C338  48 00 10 FD */ bl fopDwTg_Init__FP16create_tag_classPv
 /* 8001F3FC 0001C33C  80 7F 00 AC */ lwz r3, 0xac(r31)
 /* 8001F400 0001C340  28 03 00 00 */ cmplwi r3, 0
 /* 8001F404 0001C344  41 82 00 3C */ beq lbl_8001F440
@@ -36,15 +36,15 @@
 lbl_8001F440:
 /* 8001F440 0001C380  80 7F 00 D8 */ lwz r3, 0xd8(r31)
 /* 8001F444 0001C384  7F E4 FB 78 */ mr r4, r31
-/* 8001F448 0001C388  48 00 30 85 */ bl fpcMtd_Create
+/* 8001F448 0001C388  48 00 30 85 */ bl fpcMtd_Create__FP20process_method_classPv
 /* 8001F44C 0001C38C  7C 7E 1B 78 */ mr r30, r3
 /* 8001F450 0001C390  2C 1E 00 04 */ cmpwi r30, 4
 /* 8001F454 0001C394  40 82 00 18 */ bne lbl_8001F46C
 /* 8001F458 0001C398  7F E3 FB 78 */ mr r3, r31
-/* 8001F45C 0001C39C  48 00 25 A5 */ bl fpcLf_GetPriority
+/* 8001F45C 0001C39C  48 00 25 A5 */ bl fpcLf_GetPriority__FPC14leafdraw_class
 /* 8001F460 0001C3A0  7C 64 07 34 */ extsh r4, r3
 /* 8001F464 0001C3A4  38 7F 00 C4 */ addi r3, r31, 0xc4
-/* 8001F468 0001C3A8  48 00 10 45 */ bl fopDwTg_ToDrawQ
+/* 8001F468 0001C3A8  48 00 10 45 */ bl fopDwTg_ToDrawQ__FP16create_tag_classi
 lbl_8001F46C:
 /* 8001F46C 0001C3AC  7F C3 F3 78 */ mr r3, r30
 /* 8001F470 0001C3B0  83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -29,7 +29,7 @@ lbl_8001F940:
 /* 8001F978 0001C8B8  39 21 00 20 */ addi r9, r1, 0x20
 /* 8001F97C 0001C8BC  39 40 00 FF */ li r10, 0xff
 /* 8001F980 0001C8C0  C0 22 82 68 */ lfs f1, lbl_80451C68-_SDA2_BASE_(r2)
-/* 8001F984 0001C8C4  48 02 D1 0D */ bl dPa_control_c_NS_set
+/* 8001F984 0001C8C4  48 02 D1 0D */ bl set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf
 /* 8001F988 0001C8C8  3B BD 00 01 */ addi r29, r29, 1
 /* 8001F98C 0001C8CC  2C 1D 00 02 */ cmpwi r29, 2
 /* 8001F990 0001C8D0  3B FF 00 02 */ addi r31, r31, 2
@@ -3,7 +3,7 @@
 /* 8001F490 0001C3D0  90 01 00 14 */ stw r0, 0x14(r1)
 /* 8001F494 0001C3D4  7C 64 1B 78 */ mr r4, r3
 /* 8001F498 0001C3D8  80 63 00 D8 */ lwz r3, 0xd8(r3)
-/* 8001F49C 0001C3DC  48 00 25 89 */ bl fpcLf_DrawMethod
+/* 8001F49C 0001C3DC  48 00 25 89 */ bl fpcLf_DrawMethod__FP21leafdraw_method_classPv
 /* 8001F4A0 0001C3E0  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001F4A4 0001C3E4  7C 08 03 A6 */ mtlr r0
 /* 8001F4A8 0001C3E8  38 21 00 10 */ addi r1, r1, 0x10
@@ -7,7 +7,7 @@
 /* 8001F4C8 0001C408  7C 00 07 75 */ extsb. r0, r0
 /* 8001F4CC 0001C40C  40 82 00 0C */ bne lbl_8001F4D8
 /* 8001F4D0 0001C410  80 64 00 D8 */ lwz r3, 0xd8(r4)
-/* 8001F4D4 0001C414  48 00 2F 8D */ bl fpcMtd_Execute
+/* 8001F4D4 0001C414  48 00 2F 8D */ bl fpcMtd_Execute__FP20process_method_classPv
 lbl_8001F4D8:
 /* 8001F4D8 0001C418  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001F4DC 0001C41C  7C 08 03 A6 */ mtlr r0
@@ -6,7 +6,7 @@
 /* 8001F4FC 0001C43C  7C 7E 1B 78 */ mr r30, r3
 /* 8001F500 0001C440  80 63 00 D8 */ lwz r3, 0xd8(r3)
 /* 8001F504 0001C444  7F C4 F3 78 */ mr r4, r30
-/* 8001F508 0001C448  48 00 2F 7D */ bl fpcMtd_IsDelete
+/* 8001F508 0001C448  48 00 2F 7D */ bl fpcMtd_IsDelete__FP20process_method_classPv
 /* 8001F50C 0001C44C  7C 7F 1B 78 */ mr r31, r3
 /* 8001F510 0001C450  2C 1F 00 01 */ cmpwi r31, 1
 /* 8001F514 0001C454  40 82 00 0C */ bne lbl_8001F520
@@ -6,7 +6,7 @@
 /* 8001F550 0001C490  7C 7E 1B 78 */ mr r30, r3
 /* 8001F554 0001C494  80 63 00 D8 */ lwz r3, 0xd8(r3)
 /* 8001F558 0001C498  7F C4 F3 78 */ mr r4, r30
-/* 8001F55C 0001C49C  48 00 2F 4D */ bl fpcMtd_Delete
+/* 8001F55C 0001C49C  48 00 2F 4D */ bl fpcMtd_Delete__FP20process_method_classPv
 /* 8001F560 0001C4A0  7C 7F 1B 78 */ mr r31, r3
 /* 8001F564 0001C4A4  38 7E 00 C4 */ addi r3, r30, 0xc4
 /* 8001F568 0001C4A8  48 00 0F 6D */ bl fopDwTg_DrawQTo__FP16create_tag_class
@@ -9,15 +9,15 @@
 /* 8001F5A8 0001C4E8  40 82 00 70 */ bne lbl_8001F618
 /* 8001F5AC 0001C4EC  83 C3 00 10 */ lwz r30, 0x10(r3)
 /* 8001F5B0 0001C4F0  38 6D 87 70 */ la r3, lbl_80450CF0(r13)
-/* 8001F5B4 0001C4F4  48 00 10 A9 */ bl fpcBs_MakeOfType
+/* 8001F5B4 0001C4F4  48 00 10 A9 */ bl fpcBs_MakeOfType__FPi
 /* 8001F5B8 0001C4F8  90 7F 00 C0 */ stw r3, 0xc0(r31)
 /* 8001F5BC 0001C4FC  80 1E 00 24 */ lwz r0, 0x24(r30)
 /* 8001F5C0 0001C500  90 1F 00 D8 */ stw r0, 0xd8(r31)
 /* 8001F5C4 0001C504  38 7F 00 C4 */ addi r3, r31, 0xc4
 /* 8001F5C8 0001C508  7F E4 FB 78 */ mr r4, r31
-/* 8001F5CC 0001C50C  48 00 0F 29 */ bl fopDwTg_Init
+/* 8001F5CC 0001C50C  48 00 0F 29 */ bl fopDwTg_Init__FP16create_tag_classPv
 /* 8001F5D0 0001C510  7F E3 FB 78 */ mr r3, r31
-/* 8001F5D4 0001C514  48 00 04 71 */ bl fopMsgM_GetAppend
+/* 8001F5D4 0001C514  48 00 04 71 */ bl fopMsgM_GetAppend__FPv
 /* 8001F5D8 0001C518  28 03 00 00 */ cmplwi r3, 0
 /* 8001F5DC 0001C51C  41 82 00 3C */ beq lbl_8001F618
 /* 8001F5E0 0001C520  80 03 00 00 */ lwz r0, 0(r3)
@@ -37,15 +37,15 @@
 lbl_8001F618:
 /* 8001F618 0001C558  80 7F 00 D8 */ lwz r3, 0xd8(r31)
 /* 8001F61C 0001C55C  7F E4 FB 78 */ mr r4, r31
-/* 8001F620 0001C560  48 00 2E AD */ bl fpcMtd_Create
+/* 8001F620 0001C560  48 00 2E AD */ bl fpcMtd_Create__FP20process_method_classPv
 /* 8001F624 0001C564  7C 7E 1B 78 */ mr r30, r3
 /* 8001F628 0001C568  2C 1E 00 04 */ cmpwi r30, 4
 /* 8001F62C 0001C56C  40 82 00 18 */ bne lbl_8001F644
 /* 8001F630 0001C570  7F E3 FB 78 */ mr r3, r31
-/* 8001F634 0001C574  48 00 23 CD */ bl fpcLf_GetPriority
+/* 8001F634 0001C574  48 00 23 CD */ bl fpcLf_GetPriority__FPC14leafdraw_class
 /* 8001F638 0001C578  7C 64 07 34 */ extsh r4, r3
 /* 8001F63C 0001C57C  38 7F 00 C4 */ addi r3, r31, 0xc4
-/* 8001F640 0001C580  48 00 0E 6D */ bl fopDwTg_ToDrawQ
+/* 8001F640 0001C580  48 00 0E 6D */ bl fopDwTg_ToDrawQ__FP16create_tag_classi
 lbl_8001F644:
 /* 8001F644 0001C584  7F C3 F3 78 */ mr r3, r30
 /* 8001F648 0001C588  83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -9,7 +9,7 @@
 /* 8001F9D4 0001C914  7C 7F 1B 78 */ mr r31, r3
 /* 8001F9D8 0001C918  80 6D 87 C0 */ lwz r3, lbl_80450D40-_SDA_BASE_(r13)
 /* 8001F9DC 0001C91C  80 9F 00 B4 */ lwz r4, 0xb4(r31)
-/* 8001F9E0 0001C920  48 00 0C 6D */ bl fpcBs_Is_JustOfType
+/* 8001F9E0 0001C920  48 00 0C 6D */ bl fpcBs_Is_JustOfType__Fii
 /* 8001F9E4 0001C924  2C 03 00 00 */ cmpwi r3, 0
 /* 8001F9E8 0001C928  41 82 00 0C */ beq lbl_8001F9F4
 /* 8001F9EC 0001C92C  80 9F 00 C8 */ lwz r4, 0xc8(r31)
@@ -1,7 +1,7 @@
 /* 8001FA24 0001C964  94 21 FF F0 */ stwu r1, -0x10(r1)
 /* 8001FA28 0001C968  7C 08 02 A6 */ mflr r0
 /* 8001FA2C 0001C96C  90 01 00 14 */ stw r0, 0x14(r1)
-/* 8001FA30 0001C970  48 00 19 29 */ bl fpcEx_SearchByID
+/* 8001FA30 0001C970  48 00 19 29 */ bl fpcEx_SearchByID__FUi
 /* 8001FA34 0001C974  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001FA38 0001C978  7C 08 03 A6 */ mtlr r0
 /* 8001FA3C 0001C97C  38 21 00 10 */ addi r1, r1, 0x10
@@ -1,7 +1,7 @@
 /* 8001FA4C 0001C98C  94 21 FF F0 */ stwu r1, -0x10(r1)
 /* 8001FA50 0001C990  7C 08 02 A6 */ mflr r0
 /* 8001FA54 0001C994  90 01 00 14 */ stw r0, 0x14(r1)
-/* 8001FA58 0001C998  48 00 26 C1 */ bl fpcM_Delete
+/* 8001FA58 0001C998  48 00 26 C1 */ bl fpcM_Delete__FPv
 /* 8001FA5C 0001C99C  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001FA60 0001C9A0  7C 08 03 A6 */ mtlr r0
 /* 8001FA64 0001C9A4  38 21 00 10 */ addi r1, r1, 0x10
@@ -23,7 +23,7 @@ lbl_8001FAB0:
 /* 8001FAC0 0001CA00  28 00 00 00 */ cmplwi r0, 0
 /* 8001FAC4 0001CA04  41 82 00 0C */ beq lbl_8001FAD0
 /* 8001FAC8 0001CA08  7F 43 D3 78 */ mr r3, r26
-/* 8001FACC 0001CA0C  48 21 87 A1 */ bl dMsgObject_c_NS_setTalkActor
+/* 8001FACC 0001CA0C  48 21 87 A1 */ bl setTalkActor__12dMsgObject_cFP10fopAc_ac_c
 lbl_8001FAD0:
 /* 8001FAD0 0001CA10  28 1C 00 00 */ cmplwi r28, 0
 /* 8001FAD4 0001CA14  41 82 00 0C */ beq lbl_8001FAE0
@@ -10,7 +10,7 @@
 /* 8001FC70 0001CBB0  7C C5 33 78 */ mr r5, r6
 /* 8001FC74 0001CBB4  7C E6 3B 78 */ mr r6, r7
 /* 8001FC78 0001CBB8  38 E0 FF FF */ li r7, -1
-/* 8001FC7C 0001CBBC  4B FF FD F1 */ bl createAppend_X2_
+/* 8001FC7C 0001CBBC  4B FF FD F1 */ bl createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi
 /* 8001FC80 0001CBC0  7C 7F 1B 79 */ or. r31, r3, r3
 /* 8001FC84 0001CBC4  40 82 00 0C */ bne lbl_8001FC90
 /* 8001FC88 0001CBC8  38 60 FF FF */ li r3, -1
@@ -21,7 +21,7 @@ lbl_8001FC90:
 /* 8001FC98 0001CBD8  7F C5 F3 78 */ mr r5, r30
 /* 8001FC9C 0001CBDC  38 C0 00 00 */ li r6, 0
 /* 8001FCA0 0001CBE0  7F E7 FB 78 */ mr r7, r31
-/* 8001FCA4 0001CBE4  48 00 40 F1 */ bl fpcSCtRq_Request
+/* 8001FCA4 0001CBE4  48 00 40 F1 */ bl fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv
 lbl_8001FCA8:
 /* 8001FCA8 0001CBE8  39 61 00 20 */ addi r11, r1, 0x20
 /* 8001FCAC 0001CBEC  48 34 25 7D */ bl _restgpr_29
@@ -10,7 +10,7 @@
 /* 8001FCE4 0001CC24  7C C5 33 78 */ mr r5, r6
 /* 8001FCE8 0001CC28  7C E6 3B 78 */ mr r6, r7
 /* 8001FCEC 0001CC2C  38 E0 FF FF */ li r7, -1
-/* 8001FCF0 0001CC30  4B FF FE 61 */ bl createTimerAppend
+/* 8001FCF0 0001CC30  4B FF FE 61 */ bl createTimerAppend__FiUlUcUcffffUi
 /* 8001FCF4 0001CC34  7C 7F 1B 79 */ or. r31, r3, r3
 /* 8001FCF8 0001CC38  40 82 00 0C */ bne lbl_8001FD04
 /* 8001FCFC 0001CC3C  38 60 FF FF */ li r3, -1
@@ -21,7 +21,7 @@ lbl_8001FD04:
 /* 8001FD0C 0001CC4C  7F C5 F3 78 */ mr r5, r30
 /* 8001FD10 0001CC50  38 C0 00 00 */ li r6, 0
 /* 8001FD14 0001CC54  7F E7 FB 78 */ mr r7, r31
-/* 8001FD18 0001CC58  48 00 40 7D */ bl fpcSCtRq_Request
+/* 8001FD18 0001CC58  48 00 40 7D */ bl fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv
 lbl_8001FD1C:
 /* 8001FD1C 0001CC5C  39 61 00 20 */ addi r11, r1, 0x20
 /* 8001FD20 0001CC60  48 34 25 09 */ bl _restgpr_29
@@ -14,7 +14,7 @@
 /* 8001FD68 0001CCA8  3C 60 80 43 */ lis r3, lbl_80430188@ha
 /* 8001FD6C 0001CCAC  38 63 01 88 */ addi r3, r3, lbl_80430188@l
 /* 8001FD70 0001CCB0  80 63 00 1C */ lwz r3, 0x1c(r3)
-/* 8001FD74 0001CCB4  48 1F F9 79 */ bl dMeter2_c_NS_emphasisButtonDelete
+/* 8001FD74 0001CCB4  48 1F F9 79 */ bl emphasisButtonDelete__9dMeter2_cFv
 lbl_8001FD78:
 /* 8001FD78 0001CCB8  88 1F 5E 8F */ lbz r0, 0x5e8f(r31)
 /* 8001FD7C 0001CCBC  28 00 00 00 */ cmplwi r0, 0
@@ -59,7 +59,7 @@ lbl_8001FDF8:
 /* 8001FE0C 0001CD4C  AB 83 02 F4 */ lha r28, 0x2f4(r3)
 lbl_8001FE10:
 /* 8001FE10 0001CD50  80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13)
-/* 8001FE14 0001CD54  4B FF FC 11 */ bl fopMsgM_SearchByID
+/* 8001FE14 0001CD54  4B FF FC 11 */ bl fopMsgM_SearchByID__FUi
 /* 8001FE18 0001CD58  28 03 00 00 */ cmplwi r3, 0
 /* 8001FE1C 0001CD5C  41 82 00 4C */ beq lbl_8001FE68
 /* 8001FE20 0001CD60  A0 03 00 F8 */ lhz r0, 0xf8(r3)
@@ -77,7 +77,7 @@ lbl_8001FE10:
 /* 8001FE50 0001CD90  7F 84 E3 78 */ mr r4, r28
 /* 8001FE54 0001CD94  7F C5 F3 78 */ mr r5, r30
 /* 8001FE58 0001CD98  38 C0 00 00 */ li r6, 0
-/* 8001FE5C 0001CD9C  48 21 3E A9 */ bl dMsgObject_c_NS_setMessageIndex
+/* 8001FE5C 0001CD9C  48 21 3E A9 */ bl setMessageIndex__12dMsgObject_cFUlUlb
 /* 8001FE60 0001CDA0  80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13)
 /* 8001FE64 0001CDA4  48 00 00 08 */ b lbl_8001FE6C
 lbl_8001FE68:
@@ -13,7 +13,7 @@
 /* 8001FEB4 0001CDF4  3C 60 80 43 */ lis r3, lbl_80430188@ha
 /* 8001FEB8 0001CDF8  38 63 01 88 */ addi r3, r3, lbl_80430188@l
 /* 8001FEBC 0001CDFC  80 63 00 1C */ lwz r3, 0x1c(r3)
-/* 8001FEC0 0001CE00  48 1F F8 2D */ bl dMeter2_c_NS_emphasisButtonDelete
+/* 8001FEC0 0001CE00  48 1F F8 2D */ bl emphasisButtonDelete__9dMeter2_cFv
 lbl_8001FEC4:
 /* 8001FEC4 0001CE04  88 1F 5E 8F */ lbz r0, 0x5e8f(r31)
 /* 8001FEC8 0001CE08  28 00 00 00 */ cmplwi r0, 0
@@ -34,7 +34,7 @@ lbl_8001FEF8:
 /* 8001FF00 0001CE40  D0 01 00 0C */ stfs f0, 0xc(r1)
 /* 8001FF04 0001CE44  D0 01 00 08 */ stfs f0, 8(r1)
 /* 8001FF08 0001CE48  80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13)
-/* 8001FF0C 0001CE4C  4B FF FB 19 */ bl fopMsgM_SearchByID
+/* 8001FF0C 0001CE4C  4B FF FB 19 */ bl fopMsgM_SearchByID__FUi
 /* 8001FF10 0001CE50  7C 7F 1B 79 */ or. r31, r3, r3
 /* 8001FF14 0001CE54  41 82 00 94 */ beq lbl_8001FFA8
 /* 8001FF18 0001CE58  A0 1F 00 F8 */ lhz r0, 0xf8(r31)
@@ -51,12 +51,12 @@ lbl_8001FEF8:
 /* 8001FF44 0001CE84  38 00 00 00 */ li r0, 0
 /* 8001FF48 0001CE88  90 1F 00 DC */ stw r0, 0xdc(r31)
 /* 8001FF4C 0001CE8C  38 60 00 00 */ li r3, 0
-/* 8001FF50 0001CE90  48 21 7B 25 */ bl dMsgObject_c_NS_setTalkPartner
+/* 8001FF50 0001CE90  48 21 7B 25 */ bl setTalkPartner__12dMsgObject_cFP10fopAc_ac_c
 /* 8001FF54 0001CE94  7F E3 FB 78 */ mr r3, r31
 /* 8001FF58 0001CE98  7F A4 EB 78 */ mr r4, r29
 /* 8001FF5C 0001CE9C  7F C5 F3 78 */ mr r5, r30
 /* 8001FF60 0001CEA0  38 C0 00 00 */ li r6, 0
-/* 8001FF64 0001CEA4  48 21 3D A1 */ bl dMsgObject_c_NS_setMessageIndex
+/* 8001FF64 0001CEA4  48 21 3D A1 */ bl setMessageIndex__12dMsgObject_cFUlUlb
 /* 8001FF68 0001CEA8  80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13)
 /* 8001FF6C 0001CEAC  48 00 00 40 */ b lbl_8001FFAC
 lbl_8001FF70:
@@ -4,7 +4,7 @@
 /* 8001FFD0 0001CF10  93 E1 00 1C */ stw r31, 0x1c(r1)
 /* 8001FFD4 0001CF14  93 C1 00 18 */ stw r30, 0x18(r1)
 /* 8001FFD8 0001CF18  7C 7E 1B 78 */ mr r30, r3
-/* 8001FFDC 0001CF1C  48 21 80 BD */ bl dMsgObject_c_NS_endFlowGroup
+/* 8001FFDC 0001CF1C  48 21 80 BD */ bl endFlowGroup__12dMsgObject_cFv
 /* 8001FFE0 0001CF20  3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha
 /* 8001FFE4 0001CF24  3B E3 61 C0 */ addi r31, r3, g_dComIfG_gameInfo@l
 /* 8001FFE8 0001CF28  88 1F 5E 8F */ lbz r0, 0x5e8f(r31)
@@ -13,7 +13,7 @@
 /* 8001FFF4 0001CF34  3C 60 80 43 */ lis r3, lbl_80430188@ha
 /* 8001FFF8 0001CF38  38 63 01 88 */ addi r3, r3, lbl_80430188@l
 /* 8001FFFC 0001CF3C  80 63 00 1C */ lwz r3, 0x1c(r3)
-/* 80020000 0001CF40  48 1F F6 ED */ bl dMeter2_c_NS_emphasisButtonDelete
+/* 80020000 0001CF40  48 1F F6 ED */ bl emphasisButtonDelete__9dMeter2_cFv
 lbl_80020004:
 /* 80020004 0001CF44  88 1F 5E 8F */ lbz r0, 0x5e8f(r31)
 /* 80020008 0001CF48  28 00 00 00 */ cmplwi r0, 0
@@ -34,7 +34,7 @@ lbl_80020038:
 /* 80020040 0001CF80  D0 01 00 0C */ stfs f0, 0xc(r1)
 /* 80020044 0001CF84  D0 01 00 08 */ stfs f0, 8(r1)
 /* 80020048 0001CF88  80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13)
-/* 8002004C 0001CF8C  4B FF F9 D9 */ bl fopMsgM_SearchByID
+/* 8002004C 0001CF8C  4B FF F9 D9 */ bl fopMsgM_SearchByID__FUi
 /* 80020050 0001CF90  28 03 00 00 */ cmplwi r3, 0
 /* 80020054 0001CF94  41 82 00 50 */ beq lbl_800200A4
 /* 80020058 0001CF98  A0 03 00 F8 */ lhz r0, 0xf8(r3)
@@ -53,7 +53,7 @@ lbl_80020038:
 /* 8002008C 0001CFCC  90 03 00 DC */ stw r0, 0xdc(r3)
 /* 80020090 0001CFD0  7F C4 F3 78 */ mr r4, r30
 /* 80020094 0001CFD4  38 A0 00 00 */ li r5, 0
-/* 80020098 0001CFD8  48 21 3D D9 */ bl dMsgObject_c_NS_setMessageIndexDemo
+/* 80020098 0001CFD8  48 21 3D D9 */ bl setMessageIndexDemo__12dMsgObject_cFUlb
 /* 8002009C 0001CFDC  80 6D 80 48 */ lwz r3, lbl_804505C8-_SDA_BASE_(r13)
 /* 800200A0 0001CFE0  48 00 00 08 */ b lbl_800200A8
 lbl_800200A4:
@@ -7,7 +7,7 @@
 /* 800200D8 0001D018  38 63 01 88 */ addi r3, r3, lbl_80430188@l
 /* 800200DC 0001D01C  7F E5 FB 78 */ mr r5, r31
 /* 800200E0 0001D020  38 C0 00 00 */ li r6, 0
-/* 800200E4 0001D024  48 1F C1 6D */ bl dMeter2Info_c_NS_getString
+/* 800200E4 0001D024  48 1F C1 6D */ bl getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c
 /* 800200E8 0001D028  7F E3 FB 78 */ mr r3, r31
 /* 800200EC 0001D02C  83 E1 00 0C */ lwz r31, 0xc(r1)
 /* 800200F0 0001D030  80 01 00 14 */ lwz r0, 0x14(r1)
@@ -11,7 +11,7 @@
 /* 80020130 0001D070  7F C5 F3 78 */ mr r5, r30
 /* 80020134 0001D074  38 C0 00 00 */ li r6, 0
 /* 80020138 0001D078  7F E7 FB 78 */ mr r7, r31
-/* 8002013C 0001D07C  48 00 3C 59 */ bl fpcSCtRq_Request
+/* 8002013C 0001D07C  48 00 3C 59 */ bl fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv
 /* 80020140 0001D080  39 61 00 20 */ addi r11, r1, 0x20
 /* 80020144 0001D084  48 34 20 E5 */ bl _restgpr_29
 /* 80020148 0001D088  80 01 00 24 */ lwz r0, 0x24(r1)
@@ -5,7 +5,7 @@
 /* 800203AC 0001D2EC  7C 7F 1B 78 */ mr r31, r3
 /* 800203B0 0001D2F0  28 04 00 00 */ cmplwi r4, 0
 /* 800203B4 0001D2F4  40 82 00 0C */ bne lbl_800203C0
-/* 800203B8 0001D2F8  4B FE E9 99 */ bl mDoExt_getGameHeap
+/* 800203B8 0001D2F8  4B FE E9 99 */ bl mDoExt_getGameHeap__Fv
 /* 800203BC 0001D2FC  7C 64 1B 78 */ mr r4, r3
 lbl_800203C0:
 /* 800203C0 0001D300  7F E3 FB 78 */ mr r3, r31
@@ -18,7 +18,7 @@
 lbl_8001E460:
 /* 8001E460 0001B3A0  80 7F 00 C0 */ lwz r3, 0xc0(r31)
 /* 8001E464 0001B3A4  7F E4 FB 78 */ mr r4, r31
-/* 8001E468 0001B3A8  48 00 40 65 */ bl fpcMtd_Create
+/* 8001E468 0001B3A8  48 00 40 65 */ bl fpcMtd_Create__FP20process_method_classPv
 /* 8001E46C 0001B3AC  83 E1 00 0C */ lwz r31, 0xc(r1)
 /* 8001E470 0001B3B0  83 C1 00 08 */ lwz r30, 8(r1)
 /* 8001E474 0001B3B4  80 01 00 14 */ lwz r0, 0x14(r1)
@@ -3,7 +3,7 @@
 /* 8001EB3C 0001BA7C  90 01 00 14 */ stw r0, 0x14(r1)
 /* 8001EB40 0001BA80  7C 64 1B 78 */ mr r4, r3
 /* 8001EB44 0001BA84  80 63 01 AC */ lwz r3, 0x1ac(r3)
-/* 8001EB48 0001BA88  48 00 39 A9 */ bl fpcNd_DrawMethod
+/* 8001EB48 0001BA88  48 00 39 A9 */ bl fpcNd_DrawMethod__FP21nodedraw_method_classPv
 /* 8001EB4C 0001BA8C  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001EB50 0001BA90  7C 08 03 A6 */ mtlr r0
 /* 8001EB54 0001BA94  38 21 00 10 */ addi r1, r1, 0x10
@@ -3,7 +3,7 @@
 /* 8001EB64 0001BAA4  90 01 00 14 */ stw r0, 0x14(r1)
 /* 8001EB68 0001BAA8  7C 64 1B 78 */ mr r4, r3
 /* 8001EB6C 0001BAAC  80 63 01 AC */ lwz r3, 0x1ac(r3)
-/* 8001EB70 0001BAB0  48 00 38 F1 */ bl fpcMtd_Execute
+/* 8001EB70 0001BAB0  48 00 38 F1 */ bl fpcMtd_Execute__FP20process_method_classPv
 /* 8001EB74 0001BAB4  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001EB78 0001BAB8  7C 08 03 A6 */ mtlr r0
 /* 8001EB7C 0001BABC  38 21 00 10 */ addi r1, r1, 0x10
@@ -3,7 +3,7 @@
 /* 8001EB8C 0001BACC  90 01 00 14 */ stw r0, 0x14(r1)
 /* 8001EB90 0001BAD0  7C 64 1B 78 */ mr r4, r3
 /* 8001EB94 0001BAD4  80 63 01 AC */ lwz r3, 0x1ac(r3)
-/* 8001EB98 0001BAD8  48 00 38 ED */ bl fpcMtd_IsDelete
+/* 8001EB98 0001BAD8  48 00 38 ED */ bl fpcMtd_IsDelete__FP20process_method_classPv
 /* 8001EB9C 0001BADC  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001EBA0 0001BAE0  7C 08 03 A6 */ mtlr r0
 /* 8001EBA4 0001BAE4  38 21 00 10 */ addi r1, r1, 0x10
@@ -6,12 +6,12 @@
 /* 8001EBC0 0001BB00  7C 7F 1B 78 */ mr r31, r3
 /* 8001EBC4 0001BB04  80 63 01 AC */ lwz r3, 0x1ac(r3)
 /* 8001EBC8 0001BB08  7F E4 FB 78 */ mr r4, r31
-/* 8001EBCC 0001BB0C  48 00 38 DD */ bl fpcMtd_Delete
+/* 8001EBCC 0001BB0C  48 00 38 DD */ bl fpcMtd_Delete__FP20process_method_classPv
 /* 8001EBD0 0001BB10  7C 7E 1B 78 */ mr r30, r3
 /* 8001EBD4 0001BB14  2C 1E 00 01 */ cmpwi r30, 1
 /* 8001EBD8 0001BB18  40 82 00 0C */ bne lbl_8001EBE4
 /* 8001EBDC 0001BB1C  38 7F 01 B0 */ addi r3, r31, 0x1b0
-/* 8001EBE0 0001BB20  48 00 05 5D */ bl fopScnTg_QueueTo
+/* 8001EBE0 0001BB20  48 00 05 5D */ bl fopScnTg_QueueTo__FP15scene_tag_class
 lbl_8001EBE4:
 /* 8001EBE4 0001BB24  7F C3 F3 78 */ mr r3, r30
 /* 8001EBE8 0001BB28  83 E1 00 0C */ lwz r31, 0xc(r1)
@@ -11,9 +11,9 @@
 /* 8001EC28 0001BB68  90 1F 01 AC */ stw r0, 0x1ac(r31)
 /* 8001EC2C 0001BB6C  38 7F 01 B0 */ addi r3, r31, 0x1b0
 /* 8001EC30 0001BB70  7F E4 FB 78 */ mr r4, r31
-/* 8001EC34 0001BB74  48 00 05 55 */ bl fopScnTg_Init
+/* 8001EC34 0001BB74  48 00 05 55 */ bl fopScnTg_Init__FP15scene_tag_classPv
 /* 8001EC38 0001BB78  38 7F 01 B0 */ addi r3, r31, 0x1b0
-/* 8001EC3C 0001BB7C  48 00 05 21 */ bl fopScnTg_ToQueue
+/* 8001EC3C 0001BB7C  48 00 05 21 */ bl fopScnTg_ToQueue__FP15scene_tag_class
 /* 8001EC40 0001BB80  80 7F 00 AC */ lwz r3, 0xac(r31)
 /* 8001EC44 0001BB84  28 03 00 00 */ cmplwi r3, 0
 /* 8001EC48 0001BB88  41 82 00 0C */ beq lbl_8001EC54
@@ -22,7 +22,7 @@
 lbl_8001EC54:
 /* 8001EC54 0001BB94  80 7F 01 AC */ lwz r3, 0x1ac(r31)
 /* 8001EC58 0001BB98  7F E4 FB 78 */ mr r4, r31
-/* 8001EC5C 0001BB9C  48 00 38 71 */ bl fpcMtd_Create
+/* 8001EC5C 0001BB9C  48 00 38 71 */ bl fpcMtd_Create__FP20process_method_classPv
 /* 8001EC60 0001BBA0  83 E1 00 0C */ lwz r31, 0xc(r1)
 /* 8001EC64 0001BBA4  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001EC68 0001BBA8  7C 08 03 A6 */ mtlr r0
@@ -4,7 +4,7 @@
 #include "dolphin/types.h"
 #include "f/f_pc/f_pc_base.h"

-typedef void* (*fop_ScnItFunc)(base_process_class* pProc, void* pUserData);
+typedef void* (*fop_ScnItFunc)(void* pProc, void* pUserData);
 void* fopScnIt_Judge(fop_ScnItFunc pFunc1, void* pUserData);

 #endif
@@ -2,7 +2,7 @@
 #define F_F_OP_SCENE_REQ_H_

 extern "C" {
-void fopScnRq_Handler(void);
+void fopScnRq_Handler__Fv(void);
 void fopScnRq_ReRequest(void);
 }

@@ -3,7 +3,7 @@
 /* 8001F1B0 0001C0F0  90 01 00 14 */ stw r0, 0x14(r1)
 /* 8001F1B4 0001C0F4  7C 64 1B 78 */ mr r4, r3
 /* 8001F1B8 0001C0F8  80 63 00 C0 */ lwz r3, 0xc0(r3)
-/* 8001F1BC 0001C0FC  48 00 28 69 */ bl fpcLf_DrawMethod
+/* 8001F1BC 0001C0FC  48 00 28 69 */ bl fpcLf_DrawMethod__FP21leafdraw_method_classPv
 /* 8001F1C0 0001C100  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001F1C4 0001C104  7C 08 03 A6 */ mtlr r0
 /* 8001F1C8 0001C108  38 21 00 10 */ addi r1, r1, 0x10
@@ -3,7 +3,7 @@
 /* 8001F1D8 0001C118  90 01 00 14 */ stw r0, 0x14(r1)
 /* 8001F1DC 0001C11C  7C 64 1B 78 */ mr r4, r3
 /* 8001F1E0 0001C120  80 63 00 C0 */ lwz r3, 0xc0(r3)
-/* 8001F1E4 0001C124  48 00 32 7D */ bl fpcMtd_Execute
+/* 8001F1E4 0001C124  48 00 32 7D */ bl fpcMtd_Execute__FP20process_method_classPv
 /* 8001F1E8 0001C128  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001F1EC 0001C12C  7C 08 03 A6 */ mtlr r0
 /* 8001F1F0 0001C130  38 21 00 10 */ addi r1, r1, 0x10
@@ -3,7 +3,7 @@
 /* 8001F200 0001C140  90 01 00 14 */ stw r0, 0x14(r1)
 /* 8001F204 0001C144  7C 64 1B 78 */ mr r4, r3
 /* 8001F208 0001C148  80 63 00 C0 */ lwz r3, 0xc0(r3)
-/* 8001F20C 0001C14C  48 00 32 79 */ bl fpcMtd_IsDelete
+/* 8001F20C 0001C14C  48 00 32 79 */ bl fpcMtd_IsDelete__FP20process_method_classPv
 /* 8001F210 0001C150  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001F214 0001C154  7C 08 03 A6 */ mtlr r0
 /* 8001F218 0001C158  38 21 00 10 */ addi r1, r1, 0x10
@@ -3,7 +3,7 @@
 /* 8001F228 0001C168  90 01 00 14 */ stw r0, 0x14(r1)
 /* 8001F22C 0001C16C  7C 64 1B 78 */ mr r4, r3
 /* 8001F230 0001C170  80 63 00 C0 */ lwz r3, 0xc0(r3)
-/* 8001F234 0001C174  48 00 32 75 */ bl fpcMtd_Delete
+/* 8001F234 0001C174  48 00 32 75 */ bl fpcMtd_Delete__FP20process_method_classPv
 /* 8001F238 0001C178  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001F23C 0001C17C  7C 08 03 A6 */ mtlr r0
 /* 8001F240 0001C180  38 21 00 10 */ addi r1, r1, 0x10
@@ -8,7 +8,7 @@
 /* 8001F264 0001C1A4  88 03 00 28 */ lbz r0, 0x28(r3)
 /* 8001F268 0001C1A8  98 04 00 C4 */ stb r0, 0xc4(r4)
 /* 8001F26C 0001C1AC  80 64 00 C0 */ lwz r3, 0xc0(r4)
-/* 8001F270 0001C1B0  48 00 32 5D */ bl fpcMtd_Create
+/* 8001F270 0001C1B0  48 00 32 5D */ bl fpcMtd_Create__FP20process_method_classPv
 /* 8001F274 0001C1B4  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 8001F278 0001C1B8  7C 08 03 A6 */ mtlr r0
 /* 8001F27C 0001C1BC  38 21 00 10 */ addi r1, r1, 0x10
@@ -35,17 +35,19 @@ typedef struct base_process_class {
    /* 0xB4 */ u32 mSubType;
 } base_process_class;  // Size: 0xB8

-extern "C" {
-
-BOOL fpcBs_Is_JustOfType(s32 pType1, s32 pType2);
-s32 fpcBs_MakeOfType(s32* pType);
+BOOL fpcBs_Is_JustOfType(int pType1, int pType2);
+s32 fpcBs_MakeOfType(int* pType);
 s32 fpcBs_MakeOfId(void);
 s32 fpcBs_Execute(base_process_class* pProc);
 void fpcBs_DeleteAppend(base_process_class* pProc);
 s32 fpcBs_IsDelete(base_process_class* pProc);
 s32 fpcBs_Delete(base_process_class* pProc);
-base_process_class* fpcBs_Create(s16 pProcTypeID, u32 pProcID, void* pData);
+base_process_class* fpcBs_Create(s16 pProcTypeID, unsigned int pProcID, void* pData);
 s32 fpcBs_SubCreate(base_process_class* pProc);
-};
+
+extern "C" {
+void fpcBs_MakeOfType__FPi(void);
+void fpcBs_Is_JustOfType__Fii(void);
+}

 #endif
@@ -7,28 +7,28 @@
 #include "f/f_pc/f_pc_create_tag.h"
 #include "global.h"

+typedef int (*fpcCtIt_MethodFunc)(void*, void*);
+typedef void* (*fpcCtIt_JudgeFunc)(void*, void*);
+
 typedef struct node_method_data {
-    cNdIt_MethodFunc mFunc;
+    fpcCtIt_MethodFunc mFunc;
    void* mpUserData;
 } node_method_data;

 typedef struct node_judge_data {
-    cNdIt_JudgeFunc mFunc;
+    fpcCtIt_JudgeFunc mFunc;
    void* mpUserData;
 } node_judge_data;

 typedef struct fpcCtIt_jilprm_c {
    u32 mUnk0;
-    cNdIt_JudgeFunc mFunc;
+    fpcCtIt_JudgeFunc mFunc;
    void* mpUserData;
 } fpcCtIt_jilprm_c;

-extern "C" {
-
-s32 fpcCtIt_Method(cNdIt_MethodFunc pJudge, void* pUserData);
-void* fpcCtIt_Judge(cNdIt_JudgeFunc pJudge, void* pUserData);
+s32 fpcCtIt_Method(fpcCtIt_MethodFunc pJudge, void* pUserData);
+void* fpcCtIt_Judge(fpcCtIt_JudgeFunc pJudge, void* pUserData);
 void* fpcCtIt_filter_JudgeInLayer(create_tag*, fpcCtIt_jilprm_c*);
-void* fpcCtIt_JudgeInLayer(u32 pUnk0, cNdIt_JudgeFunc pFunc, void* pUserData);
-};
+void* fpcCtIt_JudgeInLayer(unsigned int pUnk0, fpcCtIt_JudgeFunc pFunc, void* pUserData);

 #endif
@@ -30,10 +30,8 @@ typedef struct create_request {
    layer_class* mpLayer;
 } create_request;  // Size: 0x48

-extern "C" {
-
-BOOL fpcCtRq_isCreatingByID(create_tag* pTag, s32* pId);
-BOOL fpcCtRq_IsCreatingByID(u32 id);
+BOOL fpcCtRq_isCreatingByID(create_tag* pTag, unsigned int* pId);
+BOOL fpcCtRq_IsCreatingByID(unsigned int id);
 void fpcCtRq_CreateQTo(create_request* pReq);
 void fpcCtRq_ToCreateQ(create_request* pReq);
 BOOL fpcCtRq_Delete(create_request* pReq);
@@ -42,6 +40,5 @@ s32 fpcCtRq_IsDoing(create_request* pReq);
 void fpcCtRq_Handler(void);
 create_request* fpcCtRq_Create(layer_class* pLayer, u32 size,
                               create_request_method_class* pCtRqMtd);
-};

 #endif
@@ -9,11 +9,8 @@ typedef struct create_tag {
    create_tag_class mBase;
 } create_tag;

-extern "C" {
-
-void fpcCtTg_ToCreateQ(create_tag_class* pTag);
-void fpcCtTg_CreateQTo(create_tag_class* pTag);
+void fpcCtTg_ToCreateQ(create_tag* pTag);
+void fpcCtTg_CreateQTo(create_tag* pTag);
 s32 fpcCtTg_Init(create_tag* pTag, void* pUserData);
-};

 #endif
@@ -6,12 +6,9 @@

 struct base_process_class;

-extern "C" {
-
-BOOL fpcCt_IsCreatingByID(u32 id);
+BOOL fpcCt_IsCreatingByID(unsigned int id);
 s32 fpcCt_IsDoing(struct base_process_class* pProc);
 BOOL fpcCt_Abort(struct base_process_class* pProc);
 void fpcCt_Handler(void);
-};

 #endif
--- a/Show More
+++ b/Show More