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>

20 files changed, 47 insertions, 72 deletions

diff --git a/include/SComponent/c_angle/asm/func_80271BD4.s b/include/SComponent/c_angle/asm/func_80271BD4.s
index e0936cdf5d..4c4e4c46f9 100644
--- a/include/SComponent/c_angle/asm/func_80271BD4.s
+++ b/include/SComponent/c_angle/asm/func_80271BD4.s
@@ -7,36 +7,36 @@
 /* 80271BEC 0026EB2C  38 6D 8C 08 */ addi r3, r13, 0x80451188 - 0x80458580 /*SDA HACK; original: lbl_80451188-_SDA_BASE_*/
 /* 80271BF0 0026EB30  38 80 00 00 */ li r4, 0
 /* 80271BF4 0026EB34  4B FF F3 A5 */ bl __ct__7cSAngleFs
-/* 80271BF8 0026EB38  3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha
-/* 80271BFC 0026EB3C  38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l
+/* 80271BF8 0026EB38  3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha
+/* 80271BFC 0026EB3C  38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l
 /* 80271C00 0026EB40  38 BF 00 00 */ addi r5, r31, 0
 /* 80271C04 0026EB44  48 0F 00 21 */ bl func_80361C24
 /* 80271C08 0026EB48  38 6D 8C 0C */ addi r3, r13, 0x8045118C - 0x80458580 /*SDA HACK; original: lbl_8045118C-_SDA_BASE_*/
 /* 80271C0C 0026EB4C  38 80 00 B6 */ li r4, 0xb6
 /* 80271C10 0026EB50  4B FF F3 89 */ bl __ct__7cSAngleFs
-/* 80271C14 0026EB54  3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha
-/* 80271C18 0026EB58  38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l
+/* 80271C14 0026EB54  3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha
+/* 80271C18 0026EB58  38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l
 /* 80271C1C 0026EB5C  38 BF 00 0C */ addi r5, r31, 0xc
 /* 80271C20 0026EB60  48 0F 00 05 */ bl func_80361C24
 /* 80271C24 0026EB64  38 6D 8C 10 */ addi r3, r13, 0x80451190 - 0x80458580 /*SDA HACK; original: lbl_80451190-_SDA_BASE_*/
 /* 80271C28 0026EB68  38 80 40 00 */ li r4, 0x4000
 /* 80271C2C 0026EB6C  4B FF F3 6D */ bl __ct__7cSAngleFs
-/* 80271C30 0026EB70  3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha
-/* 80271C34 0026EB74  38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l
+/* 80271C30 0026EB70  3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha
+/* 80271C34 0026EB74  38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l
 /* 80271C38 0026EB78  38 BF 00 18 */ addi r5, r31, 0x18
 /* 80271C3C 0026EB7C  48 0E FF E9 */ bl func_80361C24
 /* 80271C40 0026EB80  38 6D 8C 14 */ addi r3, r13, 0x80451194 - 0x80458580 /*SDA HACK; original: lbl_80451194-_SDA_BASE_*/
 /* 80271C44 0026EB84  38 80 80 00 */ li r4, -32768
 /* 80271C48 0026EB88  4B FF F3 51 */ bl __ct__7cSAngleFs
-/* 80271C4C 0026EB8C  3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha
-/* 80271C50 0026EB90  38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l
+/* 80271C4C 0026EB8C  3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha
+/* 80271C50 0026EB90  38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l
 /* 80271C54 0026EB94  38 BF 00 24 */ addi r5, r31, 0x24
 /* 80271C58 0026EB98  48 0E FF CD */ bl func_80361C24
 /* 80271C5C 0026EB9C  38 6D 8C 18 */ addi r3, r13, 0x80451198 - 0x80458580 /*SDA HACK; original: lbl_80451198-_SDA_BASE_*/
 /* 80271C60 0026EBA0  38 80 C0 00 */ li r4, -16384
 /* 80271C64 0026EBA4  4B FF F3 35 */ bl __ct__7cSAngleFs
-/* 80271C68 0026EBA8  3C 80 80 03 */ lis r4, cSAngle_NS_dtor@ha
-/* 80271C6C 0026EBAC  38 84 05 10 */ addi r4, r4, cSAngle_NS_dtor@l
+/* 80271C68 0026EBA8  3C 80 80 03 */ lis r4, __dt__7cSAngleFv@ha
+/* 80271C6C 0026EBAC  38 84 05 10 */ addi r4, r4, __dt__7cSAngleFv@l
 /* 80271C70 0026EBB0  38 BF 00 30 */ addi r5, r31, 0x30
 /* 80271C74 0026EBB4  48 0E FF B1 */ bl func_80361C24
 /* 80271C78 0026EBB8  83 E1 00 0C */ lwz r31, 0xc(r1)
diff --git a/include/SComponent/c_bg_w.h b/include/SComponent/c_bg_w.h
index ed34c756b9..764d6f53a8 100644
--- a/include/SComponent/c_bg_w.h
+++ b/include/SComponent/c_bg_w.h
@@ -14,12 +14,14 @@ private:
     unsigned short mId;
 };
 
-extern "C" {
-
 bool cBgW_CheckBGround(float a1);
 bool cBgW_CheckBRoof(float a1);
 bool cBgW_CheckBWall(float a1);
 
-}  // extern "C"
+extern "C" {
+void cBgW_CheckBGround__Ff(void);
+void cBgW_CheckBRoof__Ff(void);
+void cBgW_CheckBWall__Ff(void);
+}
 
 #endif
diff --git a/include/SComponent/c_cc_d/asm/func_802649F8.s b/include/SComponent/c_cc_d/asm/func_802649F8.s
index e2415f65d1..14202c4594 100644
--- a/include/SComponent/c_cc_d/asm/func_802649F8.s
+++ b/include/SComponent/c_cc_d/asm/func_802649F8.s
@@ -10,8 +10,8 @@
 /* 80264A1C 0026195C  D0 03 00 04 */ stfs f0, 4(r3)
 /* 80264A20 00261960  C0 04 00 08 */ lfs f0, 8(r4)
 /* 80264A24 00261964  D0 03 00 08 */ stfs f0, 8(r3)
-/* 80264A28 00261968  3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha
-/* 80264A2C 0026196C  38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l
+/* 80264A28 00261968  3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha
+/* 80264A2C 0026196C  38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l
 /* 80264A30 00261970  3C A0 80 43 */ lis r5, lbl_80430CA8@ha
 /* 80264A34 00261974  38 A5 0C A8 */ addi r5, r5, lbl_80430CA8@l
 /* 80264A38 00261978  48 0F D1 ED */ bl func_80361C24
diff --git a/include/SComponent/c_cc_d/asm/func_80264A54.s b/include/SComponent/c_cc_d/asm/func_80264A54.s
index 3d1ef23b9b..d59aab9a04 100644
--- a/include/SComponent/c_cc_d/asm/func_80264A54.s
+++ b/include/SComponent/c_cc_d/asm/func_80264A54.s
@@ -1,3 +1,3 @@
 /* 80264A54 00261994  38 63 FF E0 */ addi r3, r3, -32
-/*.global cCcD_CpsAttr_NS_dtor*/
-/* 80264A58 00261998  4B E2 09 F8 */ b cCcD_CpsAttr_NS_dtor
\ No newline at end of file
+/*.global __dt__12cCcD_CpsAttrFv*/
+/* 80264A58 00261998  4B E2 09 F8 */ b __dt__12cCcD_CpsAttrFv
\ No newline at end of file
diff --git a/include/SComponent/c_cc_d/asm/func_80264A5C.s b/include/SComponent/c_cc_d/asm/func_80264A5C.s
index 1f91ae7eed..c15bf9f230 100644
--- a/include/SComponent/c_cc_d/asm/func_80264A5C.s
+++ b/include/SComponent/c_cc_d/asm/func_80264A5C.s
@@ -1,3 +1,3 @@
 /* 80264A5C 0026199C  38 63 FF E0 */ addi r3, r3, -32
-/*.global cCcD_CylAttr_NS_dtor*/
-/* 80264A60 002619A0  4B E2 0A 80 */ b cCcD_CylAttr_NS_dtor
\ No newline at end of file
+/*.global __dt__12cCcD_CylAttrFv*/
+/* 80264A60 002619A0  4B E2 0A 80 */ b __dt__12cCcD_CylAttrFv
\ No newline at end of file
diff --git a/include/SComponent/c_cc_d/asm/func_80264A64.s b/include/SComponent/c_cc_d/asm/func_80264A64.s
index 42db5475cf..c33ab6ce7c 100644
--- a/include/SComponent/c_cc_d/asm/func_80264A64.s
+++ b/include/SComponent/c_cc_d/asm/func_80264A64.s
@@ -1,3 +1,3 @@
 /* 80264A64 002619A4  38 63 FF E0 */ addi r3, r3, -32
-/*.global cCcD_SphAttr_NS_dtor*/
-/* 80264A68 002619A8  4B E2 27 B4 */ b cCcD_SphAttr_NS_dtor
\ No newline at end of file
+/*.global __dt__12cCcD_SphAttrFv*/
+/* 80264A68 002619A8  4B E2 27 B4 */ b __dt__12cCcD_SphAttrFv
\ No newline at end of file
diff --git a/include/SComponent/c_cc_s/asm/func_80264F40.s b/include/SComponent/c_cc_s/asm/func_80264F40.s
index 500d911635..b7f3a67eb4 100644
--- a/include/SComponent/c_cc_s/asm/func_80264F40.s
+++ b/include/SComponent/c_cc_s/asm/func_80264F40.s
@@ -59,8 +59,8 @@ lbl_80264FB8:
 /* 80265020 00261F60  40 82 00 28 */ bne lbl_80265048
 /* 80265024 00261F64  3C 60 80 43 */ lis r3, lbl_80430CCC@ha
 /* 80265028 00261F68  38 63 0C CC */ addi r3, r3, lbl_80430CCC@l
-/* 8026502C 00261F6C  3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha
-/* 80265030 00261F70  38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l
+/* 8026502C 00261F6C  3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha
+/* 80265030 00261F70  38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l
 /* 80265034 00261F74  3C A0 80 43 */ lis r5, lbl_80430CC0@ha
 /* 80265038 00261F78  38 A5 0C C0 */ addi r5, r5, lbl_80430CC0@l
 /* 8026503C 00261F7C  48 0F CB E9 */ bl func_80361C24
diff --git a/include/SComponent/c_cc_s/asm/func_802653A0.s b/include/SComponent/c_cc_s/asm/func_802653A0.s
index 844f85d8aa..ed4ff26589 100644
--- a/include/SComponent/c_cc_s/asm/func_802653A0.s
+++ b/include/SComponent/c_cc_s/asm/func_802653A0.s
@@ -3,7 +3,7 @@
 /* 802653A8 002622E8  90 01 00 14 */ stw r0, 0x14(r1)
 /* 802653AC 002622EC  7C E3 3B 78 */ mr r3, r7
 /* 802653B0 002622F0  88 84 00 14 */ lbz r4, 0x14(r4)
-/* 802653B4 002622F4  4B FF E5 BD */ bl cCcD_Stts_NS_PlusDmg
+/* 802653B4 002622F4  4B FF E5 BD */ bl PlusDmg__9cCcD_SttsFi
 /* 802653B8 002622F8  80 01 00 14 */ lwz r0, 0x14(r1)
 /* 802653BC 002622FC  7C 08 03 A6 */ mtlr r0
 /* 802653C0 00262300  38 21 00 10 */ addi r1, r1, 0x10
diff --git a/include/SComponent/c_list.h b/include/SComponent/c_list.h
index 648d34701e..572ba4c182 100644
--- a/include/SComponent/c_list.h
+++ b/include/SComponent/c_list.h
@@ -10,14 +10,11 @@ typedef struct node_list_class {
     int mSize;
 } node_list_class;
 
-extern "C" {
-
 void cLs_Init(node_list_class* pList);
 int cLs_SingleCut(node_class* pNode);
 int cLs_Addition(node_list_class* pList, node_class* pNode);
 int cLs_Insert(node_list_class* pList, int idx, node_class* pNode);
 node_class* cLs_GetFirst(node_list_class* pList);
 void cLs_Create(node_list_class* pList);
-};
 
 #endif
diff --git a/include/SComponent/c_list_iter.h b/include/SComponent/c_list_iter.h
index 6a55edc2ef..ca96c4eacf 100644
--- a/include/SComponent/c_list_iter.h
+++ b/include/SComponent/c_list_iter.h
@@ -6,10 +6,7 @@
 #include "SComponent/c_node_iter.h"
 #include "global.h"
 
-extern "C" {
-
 int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData);
 void* cLsIt_Judge(node_list_class* pList, cNdIt_JudgeFunc pJudge, void* pUserData);
-};
 
 #endif
diff --git a/include/SComponent/c_node.h b/include/SComponent/c_node.h
index f120e3ec75..173b38a80b 100644
--- a/include/SComponent/c_node.h
+++ b/include/SComponent/c_node.h
@@ -10,8 +10,6 @@ typedef struct node_class {
     struct node_class* mpNextNode;
 } node_class;
 
-extern "C" {
-
 void cNd_Join(node_class* pA, node_class* pB);
 int cNd_LengthOf(node_class* pNode);
 node_class* cNd_First(node_class* pNode);
@@ -25,6 +23,5 @@ void cNd_SetObject(node_class* pNode, void* pData);
 void cNd_ClearObject(node_class* pNode);
 void cNd_ForcedClear(node_class* pNode);
 void cNd_Create(node_class* pNode, void* pData);
-};
 
 #endif
diff --git a/include/SComponent/c_node_iter.h b/include/SComponent/c_node_iter.h
index 2813803c73..7797df3df4 100644
--- a/include/SComponent/c_node_iter.h
+++ b/include/SComponent/c_node_iter.h
@@ -4,13 +4,10 @@
 
 #include "SComponent/c_node.h"
 
-extern "C" {
-
 typedef int (*cNdIt_MethodFunc)(node_class* pNode, void* pUserData);
 int cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData);
 
 typedef void* (*cNdIt_JudgeFunc)(node_class* pNode, void* pUserData);
 void* cNdIt_Judge(node_class* pNode, cNdIt_JudgeFunc pJudge, void* pUserData);
-};
 
 #endif
diff --git a/include/SComponent/c_phase.h b/include/SComponent/c_phase.h
index 91737ced0a..f0bb5f5ca5 100644
--- a/include/SComponent/c_phase.h
+++ b/include/SComponent/c_phase.h
@@ -17,8 +17,6 @@ typedef struct request_of_phase_process_class {
     int mPhaseStep;
 } request_of_phase_process_class;
 
-extern "C" {
-
 void cPhs_Reset(request_of_phase_process_class* pPhase);
 void cPhs_Set(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable);
 void cPhs_UnCompleate(request_of_phase_process_class* pPhase);
@@ -27,6 +25,5 @@ int cPhs_Next(request_of_phase_process_class* pPhase);
 int cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData);
 int cPhs_Handler(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable,
                  void* pUserData);
-};
 
 #endif
diff --git a/include/SComponent/c_sxyz/asm/func_8026758C.s b/include/SComponent/c_sxyz/asm/func_8026758C.s
index 8923b6c46f..ec01258beb 100644
--- a/include/SComponent/c_sxyz/asm/func_8026758C.s
+++ b/include/SComponent/c_sxyz/asm/func_8026758C.s
@@ -11,10 +11,10 @@
 /* 802675B4 002644F4  A0 01 00 0C */ lhz r0, 0xc(r1)
 /* 802675B8 002644F8  B0 0D 8B E4 */ sth r0, lbl_80451164-_SDA_BASE_(r13)
 /* 802675BC 002644FC  38 6D 8B E0 */ addi r3, r13, 0x80451160 - 0x80458580 /*SDA HACK; original: lbl_80451160-_SDA_BASE_*/
-/*.global csXyz_NS_dtor*/
-/* 802675C0 00264500  3C 80 80 02 */ lis r4, csXyz_NS_dtor@ha
-/*.global csXyz_NS_dtor*/
-/* 802675C4 00264504  38 84 8B D0 */ addi r4, r4, csXyz_NS_dtor@l
+/*.global __dt__5csXyzFv*/
+/* 802675C0 00264500  3C 80 80 02 */ lis r4, __dt__5csXyzFv@ha
+/*.global __dt__5csXyzFv*/
+/* 802675C4 00264504  38 84 8B D0 */ addi r4, r4, __dt__5csXyzFv@l
 /* 802675C8 00264508  3C A0 80 43 */ lis r5, lbl_80430DA8@ha
 /* 802675CC 0026450C  38 A5 0D A8 */ addi r5, r5, lbl_80430DA8@l
 /* 802675D0 00264510  48 0F A6 55 */ bl func_80361C24
diff --git a/include/SComponent/c_tag.h b/include/SComponent/c_tag.h
index 8facd1d8cf..464c4fdbdc 100644
--- a/include/SComponent/c_tag.h
+++ b/include/SComponent/c_tag.h
@@ -13,8 +13,6 @@ typedef struct create_tag_class {
     s8 mbIsUse;
 } create_tag_class;
 
-extern "C" {
-
 int cTg_IsUse(create_tag_class* pTag);
 int cTg_SingleCutFromTree(create_tag_class* pTag);
 int cTg_AdditionToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag);
@@ -23,6 +21,5 @@ node_class* cTg_GetFirst(node_list_class* pTag);
 int cTg_SingleCut(create_tag_class* pTag);
 int cTg_Addition(node_list_class* pList, create_tag_class* pTag);
 void cTg_Create(create_tag_class* pTag, void* pData);
-};
 
 #endif
diff --git a/include/SComponent/c_tag_iter.h b/include/SComponent/c_tag_iter.h
index d179b6916b..24d9818398 100644
--- a/include/SComponent/c_tag_iter.h
+++ b/include/SComponent/c_tag_iter.h
@@ -16,10 +16,7 @@ typedef struct judge_filter {
     void* mpUserData;
 } judge_filter;
 
-extern "C" {
-
 int cTgIt_MethodCall(create_tag_class* pTag, method_filter* pMethodFilter);
 void* cTgIt_JudgeFilter(create_tag_class* pTag, judge_filter* pJudgeFilter);
-};
 
 #endif
diff --git a/include/SComponent/c_tree.h b/include/SComponent/c_tree.h
index e97c6100be..09e1a9056c 100644
--- a/include/SComponent/c_tree.h
+++ b/include/SComponent/c_tree.h
@@ -10,12 +10,9 @@ typedef struct node_lists_tree_class {
     int mNumLists;
 } node_lists_tree_class;
 
-extern "C" {
-
 int cTr_SingleCut(node_class* pNode);
 int cTr_Addition(node_lists_tree_class* pTree, int listIdx, node_class* pNode);
 int cTr_Insert(node_lists_tree_class* pTree, int listIdx, node_class* pNode, int idx);
 void cTr_Create(node_lists_tree_class* pTree, node_list_class* pLists, int numLists);
-};
 
 #endif
diff --git a/include/SComponent/c_tree_iter.h b/include/SComponent/c_tree_iter.h
index 7cf639ffee..d1b366b037 100644
--- a/include/SComponent/c_tree_iter.h
+++ b/include/SComponent/c_tree_iter.h
@@ -6,10 +6,7 @@
 #include "SComponent/c_tree.h"
 #include "global.h"
 
-extern "C" {
-
 int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pJudgeFunc, void* pUserData);
 void* cTrIt_Judge(node_lists_tree_class* pTree, cNdIt_JudgeFunc pJudgeFunc, void* pUserData);
-};
 
 #endif
diff --git a/include/SComponent/c_xyz.h b/include/SComponent/c_xyz.h
index df9326c912..a035193b2c 100644
--- a/include/SComponent/c_xyz.h
+++ b/include/SComponent/c_xyz.h
@@ -121,7 +121,7 @@ extern cXyz lbl_80430D0C;  // SComponent::cXyz::BaseX
 extern cXyz lbl_80430D24;  // SComponent::cXyz::BaseY
 
 extern "C" {  // needed for inline asm
-void cXyz_NS_dtor(void);
+void __dt__4cXyzFv(void);
 }
 
 #endif
diff --git a/include/SComponent/c_xyz/asm/func_80267290.s b/include/SComponent/c_xyz/asm/func_80267290.s
index 77a3ff6923..840b4038ec 100644
--- a/include/SComponent/c_xyz/asm/func_80267290.s
+++ b/include/SComponent/c_xyz/asm/func_80267290.s
@@ -9,8 +9,8 @@
 /* 802672B0 002641F0  38 7F 00 0C */ addi r3, r31, 0xc
 /* 802672B4 002641F4  D0 03 00 04 */ stfs f0, 4(r3)
 /* 802672B8 002641F8  D0 03 00 08 */ stfs f0, 8(r3)
-/* 802672BC 002641FC  3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha
-/* 802672C0 00264200  38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l
+/* 802672BC 002641FC  3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha
+/* 802672C0 00264200  38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l
 /* 802672C4 00264204  38 BF 00 00 */ addi r5, r31, 0
 /* 802672C8 00264208  48 0F A9 5D */ bl func_80361C24
 /* 802672CC 0026420C  C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2)
@@ -19,8 +19,8 @@
 /* 802672D8 00264218  38 7F 00 24 */ addi r3, r31, 0x24
 /* 802672DC 0026421C  D0 03 00 04 */ stfs f0, 4(r3)
 /* 802672E0 00264220  D0 03 00 08 */ stfs f0, 8(r3)
-/* 802672E4 00264224  3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha
-/* 802672E8 00264228  38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l
+/* 802672E4 00264224  3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha
+/* 802672E8 00264228  38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l
 /* 802672EC 0026422C  38 BF 00 18 */ addi r5, r31, 0x18
 /* 802672F0 00264230  48 0F A9 35 */ bl func_80361C24
 /* 802672F4 00264234  C0 22 B6 80 */ lfs f1, lbl_80455080-_SDA2_BASE_(r2)
@@ -29,8 +29,8 @@
 /* 80267300 00264240  38 7F 00 3C */ addi r3, r31, 0x3c
 /* 80267304 00264244  D0 03 00 04 */ stfs f0, 4(r3)
 /* 80267308 00264248  D0 23 00 08 */ stfs f1, 8(r3)
-/* 8026730C 0026424C  3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha
-/* 80267310 00264250  38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l
+/* 8026730C 0026424C  3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha
+/* 80267310 00264250  38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l
 /* 80267314 00264254  38 BF 00 30 */ addi r5, r31, 0x30
 /* 80267318 00264258  48 0F A9 0D */ bl func_80361C24
 /* 8026731C 0026425C  C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2)
@@ -39,8 +39,8 @@
 /* 80267328 00264268  D0 03 00 04 */ stfs f0, 4(r3)
 /* 8026732C 0026426C  C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2)
 /* 80267330 00264270  D0 03 00 08 */ stfs f0, 8(r3)
-/* 80267334 00264274  3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha
-/* 80267338 00264278  38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l
+/* 80267334 00264274  3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha
+/* 80267338 00264278  38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l
 /* 8026733C 0026427C  38 BF 00 48 */ addi r5, r31, 0x48
 /* 80267340 00264280  48 0F A8 E5 */ bl func_80361C24
 /* 80267344 00264284  C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2)
@@ -49,8 +49,8 @@
 /* 80267350 00264290  D0 03 00 04 */ stfs f0, 4(r3)
 /* 80267354 00264294  C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2)
 /* 80267358 00264298  D0 03 00 08 */ stfs f0, 8(r3)
-/* 8026735C 0026429C  3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha
-/* 80267360 002642A0  38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l
+/* 8026735C 0026429C  3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha
+/* 80267360 002642A0  38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l
 /* 80267364 002642A4  38 BF 00 60 */ addi r5, r31, 0x60
 /* 80267368 002642A8  48 0F A8 BD */ bl func_80361C24
 /* 8026736C 002642AC  C0 22 B6 70 */ lfs f1, lbl_80455070-_SDA2_BASE_(r2)
@@ -59,8 +59,8 @@
 /* 80267378 002642B8  38 7F 00 84 */ addi r3, r31, 0x84
 /* 8026737C 002642BC  D0 03 00 04 */ stfs f0, 4(r3)
 /* 80267380 002642C0  D0 23 00 08 */ stfs f1, 8(r3)
-/* 80267384 002642C4  3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha
-/* 80267388 002642C8  38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l
+/* 80267384 002642C4  3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha
+/* 80267388 002642C8  38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l
 /* 8026738C 002642CC  38 BF 00 78 */ addi r5, r31, 0x78
 /* 80267390 002642D0  48 0F A8 95 */ bl func_80361C24
 /* 80267394 002642D4  C0 02 B6 80 */ lfs f0, lbl_80455080-_SDA2_BASE_(r2)
@@ -69,8 +69,8 @@
 /* 802673A0 002642E0  38 7F 00 9C */ addi r3, r31, 0x9c
 /* 802673A4 002642E4  D0 03 00 04 */ stfs f0, 4(r3)
 /* 802673A8 002642E8  D0 03 00 08 */ stfs f0, 8(r3)
-/* 802673AC 002642EC  3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha
-/* 802673B0 002642F0  38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l
+/* 802673AC 002642EC  3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha
+/* 802673B0 002642F0  38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l
 /* 802673B4 002642F4  38 BF 00 90 */ addi r5, r31, 0x90
 /* 802673B8 002642F8  48 0F A8 6D */ bl func_80361C24
 /* 802673BC 002642FC  C0 02 B6 70 */ lfs f0, lbl_80455070-_SDA2_BASE_(r2)
@@ -78,8 +78,8 @@
 /* 802673C4 00264304  38 7F 00 B4 */ addi r3, r31, 0xb4
 /* 802673C8 00264308  D0 03 00 04 */ stfs f0, 4(r3)
 /* 802673CC 0026430C  D0 03 00 08 */ stfs f0, 8(r3)
-/* 802673D0 00264310  3C 80 80 01 */ lis r4, cXyz_NS_dtor@ha
-/* 802673D4 00264314  38 84 91 84 */ addi r4, r4, cXyz_NS_dtor@l
+/* 802673D0 00264310  3C 80 80 01 */ lis r4, __dt__4cXyzFv@ha
+/* 802673D4 00264314  38 84 91 84 */ addi r4, r4, __dt__4cXyzFv@l
 /* 802673D8 00264318  38 BF 00 A8 */ addi r5, r31, 0xa8
 /* 802673DC 0026431C  48 0F A8 49 */ bl func_80361C24
 /* 802673E0 00264320  83 E1 00 0C */ lwz r31, 0xc(r1)