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>

6 files changed, 36 insertions, 34 deletions

diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h
index 505c9b7cd9..e55cd14eb8 100644
--- a/include/JSystem/J2DGraph/J2DPane.h
+++ b/include/JSystem/J2DGraph/J2DPane.h
@@ -18,9 +18,9 @@
 // additional symbols needed for J2DPane.cpp
 // autogenerated by split.py v0.3 at 2021-01-19 06:47:42.730250
 extern "C" {
-void J2DDataManage_NS_get_X1_(void);
+void get__13J2DDataManageFP14JSUInputStream(void);
 void J2DGrafContext_NS_scissor(void);
-void J2DGrafContext_NS_setScissor(void);
+void setScissor__14J2DGrafContextFv(void);
 void J2DOrthoGraph_NS_scissorBounds(void);
 void J2DCast_F32_to_S16__7J2DPaneFfUc(void);
 void animationPane__7J2DPaneFPC15J2DAnmTransform(void);
@@ -55,9 +55,11 @@ void updateTransform__7J2DPaneFPC15J2DAnmTransform(void);
 void J2DPane_X1_(void);
 void J2DPane_X2_(void);
 void __ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc(void);
-void JSURandomInputStream_NS_align(void);
-void JSURandomInputStream_NS_peek(void);
-void* JUTResReference_NS_getResource(JSURandomInputStream* stream, u32 arg2, JKRArchive* archive);
+void align__20JSURandomInputStreamFl(void);
+void peek__20JSURandomInputStreamFPvl(void);
+void* getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive(JSURandomInputStream* stream,
+                                                                      u32 arg2,
+                                                                      JKRArchive* archive);
 void move__7J2DPaneFff(void);
 void add__7J2DPaneFff(void);
 void makeMatrix__7J2DPaneFffff(void);
@@ -70,7 +72,7 @@ void func_802F8428(void);
 void func_802F8464(void);
 void func_802F8474(void);
 void func_802F8478(void);
-void func_802F847C(void);
+void __sinit_J2DPane_cpp(void);
 }
 
 // additional symbols needed for J2DPane.cpp
@@ -103,7 +105,7 @@ public:
     /* 0x18 */ virtual void resize(f32 x, f32 y);
     /* 0x1c */ virtual void setCullBack(bool cull);
     /* 0x20 */ virtual void setCullBack(GXCullMode cmode);
-    /* 0x24 */ virtual void setAlpha();
+    /* 0x24 */ virtual void setAlpha__FP16J3DMaterialTable();
     /* 0x28 */ virtual bool setConnectParent(bool connected);
     /* 0x2c */ virtual void calcMtx();
     /* 0x30 */ virtual void update();
diff --git a/include/JSystem/J2DGraph/J2DPane/asm/func_802F5F9C.s b/include/JSystem/J2DGraph/J2DPane/asm/func_802F5F9C.s
index 67a10af231..9e3b2322f0 100644
--- a/include/JSystem/J2DGraph/J2DPane/asm/func_802F5F9C.s
+++ b/include/JSystem/J2DGraph/J2DPane/asm/func_802F5F9C.s
@@ -29,7 +29,7 @@
 /* 802F600C 002F2F4C  7F C3 F3 78 */ mr r3, r30
 /* 802F6010 002F2F50  38 81 00 10 */ addi r4, r1, 0x10
 /* 802F6014 002F2F54  38 A0 00 08 */ li r5, 8
-/* 802F6018 002F2F58  4B FE 62 81 */ bl JSUInputStream_NS_read
+/* 802F6018 002F2F58  4B FE 62 81 */ bl read__14JSUInputStreamFPvl
 /* 802F601C 002F2F5C  80 01 00 10 */ lwz r0, 0x10(r1)
 /* 802F6020 002F2F60  90 1B 00 08 */ stw r0, 8(r27)
 /* 802F6024 002F2F64  80 01 00 14 */ lwz r0, 0x14(r1)
@@ -41,7 +41,7 @@
 /* 802F603C 002F2F7C  7F C3 F3 78 */ mr r3, r30
 /* 802F6040 002F2F80  7F E4 FB 78 */ mr r4, r31
 /* 802F6044 002F2F84  38 A0 00 00 */ li r5, 0
-/* 802F6048 002F2F88  4B FE 64 95 */ bl JSURandomInputStream_NS_seek
+/* 802F6048 002F2F88  4B FE 64 95 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom
 /* 802F604C 002F2F8C  48 00 00 5C */ b lbl_802F60A8
 lbl_802F6050:
 /* 802F6050 002F2F90  7F C3 F3 78 */ mr r3, r30
@@ -53,7 +53,7 @@ lbl_802F6050:
 /* 802F6068 002F2FA8  7F C3 F3 78 */ mr r3, r30
 /* 802F606C 002F2FAC  38 81 00 08 */ addi r4, r1, 8
 /* 802F6070 002F2FB0  38 A0 00 08 */ li r5, 8
-/* 802F6074 002F2FB4  4B FE 63 E5 */ bl JSURandomInputStream_NS_peek
+/* 802F6074 002F2FB4  4B FE 63 E5 */ bl peek__20JSURandomInputStreamFPvl
 /* 802F6078 002F2FB8  80 01 00 08 */ lwz r0, 8(r1)
 /* 802F607C 002F2FBC  90 1B 00 08 */ stw r0, 8(r27)
 /* 802F6080 002F2FC0  80 01 00 0C */ lwz r0, 0xc(r1)
@@ -65,7 +65,7 @@ lbl_802F6050:
 /* 802F6098 002F2FD8  7F C3 F3 78 */ mr r3, r30
 /* 802F609C 002F2FDC  7F E4 FB 78 */ mr r4, r31
 /* 802F60A0 002F2FE0  38 A0 00 00 */ li r5, 0
-/* 802F60A4 002F2FE4  4B FE 64 39 */ bl JSURandomInputStream_NS_seek
+/* 802F60A4 002F2FE4  4B FE 64 39 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom
 lbl_802F60A8:
 /* 802F60A8 002F2FE8  7F 63 DB 78 */ mr r3, r27
 /* 802F60AC 002F2FEC  39 61 00 30 */ addi r11, r1, 0x30
diff --git a/include/JSystem/J2DGraph/J2DPane/asm/func_802F60C4.s b/include/JSystem/J2DGraph/J2DPane/asm/func_802F60C4.s
index fefedaf372..70a1f614ee 100644
--- a/include/JSystem/J2DGraph/J2DPane/asm/func_802F60C4.s
+++ b/include/JSystem/J2DGraph/J2DPane/asm/func_802F60C4.s
@@ -15,11 +15,11 @@
 /* 802F60FC 002F303C  7F E3 FB 78 */ mr r3, r31
 /* 802F6100 002F3040  38 81 00 0B */ addi r4, r1, 0xb
 /* 802F6104 002F3044  38 A0 00 01 */ li r5, 1
-/* 802F6108 002F3048  4B FE 61 91 */ bl JSUInputStream_NS_read
+/* 802F6108 002F3048  4B FE 61 91 */ bl read__14JSUInputStreamFPvl
 /* 802F610C 002F304C  7F E3 FB 78 */ mr r3, r31
 /* 802F6110 002F3050  38 9D 00 B0 */ addi r4, r29, 0xb0
 /* 802F6114 002F3054  38 A0 00 01 */ li r5, 1
-/* 802F6118 002F3058  4B FE 61 81 */ bl JSUInputStream_NS_read
+/* 802F6118 002F3058  4B FE 61 81 */ bl read__14JSUInputStreamFPvl
 /* 802F611C 002F305C  7F E3 FB 78 */ mr r3, r31
 /* 802F6120 002F3060  38 80 00 02 */ li r4, 2
 /* 802F6124 002F3064  81 9F 00 00 */ lwz r12, 0(r31)
@@ -29,7 +29,7 @@
 /* 802F6134 002F3074  7F E3 FB 78 */ mr r3, r31
 /* 802F6138 002F3078  38 81 00 18 */ addi r4, r1, 0x18
 /* 802F613C 002F307C  38 A0 00 04 */ li r5, 4
-/* 802F6140 002F3080  4B FE 61 59 */ bl JSUInputStream_NS_read
+/* 802F6140 002F3080  4B FE 61 59 */ bl read__14JSUInputStreamFPvl
 /* 802F6144 002F3084  80 61 00 18 */ lwz r3, 0x18(r1)
 /* 802F6148 002F3088  38 00 00 00 */ li r0, 0
 /* 802F614C 002F308C  90 7D 00 14 */ stw r3, 0x14(r29)
@@ -37,7 +37,7 @@
 /* 802F6154 002F3094  7F E3 FB 78 */ mr r3, r31
 /* 802F6158 002F3098  38 81 00 14 */ addi r4, r1, 0x14
 /* 802F615C 002F309C  38 A0 00 02 */ li r5, 2
-/* 802F6160 002F30A0  4B FE 61 39 */ bl JSUInputStream_NS_read
+/* 802F6160 002F30A0  4B FE 61 39 */ bl read__14JSUInputStreamFPvl
 /* 802F6164 002F30A4  A8 01 00 14 */ lha r0, 0x14(r1)
 /* 802F6168 002F30A8  C8 22 C7 F8 */ lfd f1, lbl_804561F8-_SDA2_BASE_(r2)
 /* 802F616C 002F30AC  6C 00 80 00 */ xoris r0, r0, 0x8000
@@ -49,7 +49,7 @@
 /* 802F6184 002F30C4  7F E3 FB 78 */ mr r3, r31
 /* 802F6188 002F30C8  38 81 00 12 */ addi r4, r1, 0x12
 /* 802F618C 002F30CC  38 A0 00 02 */ li r5, 2
-/* 802F6190 002F30D0  4B FE 61 09 */ bl JSUInputStream_NS_read
+/* 802F6190 002F30D0  4B FE 61 09 */ bl read__14JSUInputStreamFPvl
 /* 802F6194 002F30D4  A8 01 00 12 */ lha r0, 0x12(r1)
 /* 802F6198 002F30D8  C8 22 C7 F8 */ lfd f1, lbl_804561F8-_SDA2_BASE_(r2)
 /* 802F619C 002F30DC  6C 00 80 00 */ xoris r0, r0, 0x8000
@@ -61,7 +61,7 @@
 /* 802F61B4 002F30F4  7F E3 FB 78 */ mr r3, r31
 /* 802F61B8 002F30F8  38 81 00 10 */ addi r4, r1, 0x10
 /* 802F61BC 002F30FC  38 A0 00 02 */ li r5, 2
-/* 802F61C0 002F3100  4B FE 60 D9 */ bl JSUInputStream_NS_read
+/* 802F61C0 002F3100  4B FE 60 D9 */ bl read__14JSUInputStreamFPvl
 /* 802F61C4 002F3104  A8 01 00 10 */ lha r0, 0x10(r1)
 /* 802F61C8 002F3108  C8 22 C7 F8 */ lfd f1, lbl_804561F8-_SDA2_BASE_(r2)
 /* 802F61CC 002F310C  6C 00 80 00 */ xoris r0, r0, 0x8000
@@ -74,7 +74,7 @@
 /* 802F61E8 002F3128  7F E3 FB 78 */ mr r3, r31
 /* 802F61EC 002F312C  38 81 00 0E */ addi r4, r1, 0xe
 /* 802F61F0 002F3130  38 A0 00 02 */ li r5, 2
-/* 802F61F4 002F3134  4B FE 60 A5 */ bl JSUInputStream_NS_read
+/* 802F61F4 002F3134  4B FE 60 A5 */ bl read__14JSUInputStreamFPvl
 /* 802F61F8 002F3138  A8 01 00 0E */ lha r0, 0xe(r1)
 /* 802F61FC 002F313C  C8 22 C7 F8 */ lfd f1, lbl_804561F8-_SDA2_BASE_(r2)
 /* 802F6200 002F3140  6C 00 80 00 */ xoris r0, r0, 0x8000
@@ -101,7 +101,7 @@
 /* 802F6254 002F3194  7F E3 FB 78 */ mr r3, r31
 /* 802F6258 002F3198  38 81 00 0C */ addi r4, r1, 0xc
 /* 802F625C 002F319C  38 A0 00 02 */ li r5, 2
-/* 802F6260 002F31A0  4B FE 60 39 */ bl JSUInputStream_NS_read
+/* 802F6260 002F31A0  4B FE 60 39 */ bl read__14JSUInputStreamFPvl
 /* 802F6264 002F31A4  A0 01 00 0C */ lhz r0, 0xc(r1)
 /* 802F6268 002F31A8  C8 22 C8 00 */ lfd f1, lbl_80456200-_SDA2_BASE_(r2)
 /* 802F626C 002F31AC  90 01 00 3C */ stw r0, 0x3c(r1)
@@ -120,7 +120,7 @@ lbl_802F6290:
 /* 802F629C 002F31DC  7F E3 FB 78 */ mr r3, r31
 /* 802F62A0 002F31E0  38 81 00 0A */ addi r4, r1, 0xa
 /* 802F62A4 002F31E4  38 A0 00 01 */ li r5, 1
-/* 802F62A8 002F31E8  4B FE 5F F1 */ bl JSUInputStream_NS_read
+/* 802F62A8 002F31E8  4B FE 5F F1 */ bl read__14JSUInputStreamFPvl
 /* 802F62AC 002F31EC  88 01 00 0A */ lbz r0, 0xa(r1)
 /* 802F62B0 002F31F0  98 1D 00 B7 */ stb r0, 0xb7(r29)
 /* 802F62B4 002F31F4  88 61 00 0B */ lbz r3, 0xb(r1)
@@ -141,7 +141,7 @@ lbl_802F62CC:
 /* 802F62E8 002F3228  7F E3 FB 78 */ mr r3, r31
 /* 802F62EC 002F322C  38 81 00 09 */ addi r4, r1, 9
 /* 802F62F0 002F3230  38 A0 00 01 */ li r5, 1
-/* 802F62F4 002F3234  4B FE 5F A5 */ bl JSUInputStream_NS_read
+/* 802F62F4 002F3234  4B FE 5F A5 */ bl read__14JSUInputStreamFPvl
 /* 802F62F8 002F3238  88 01 00 09 */ lbz r0, 9(r1)
 /* 802F62FC 002F323C  98 1D 00 B2 */ stb r0, 0xb2(r29)
 /* 802F6300 002F3240  88 61 00 0B */ lbz r3, 0xb(r1)
@@ -156,7 +156,7 @@ lbl_802F630C:
 /* 802F6320 002F3260  7F E3 FB 78 */ mr r3, r31
 /* 802F6324 002F3264  38 81 00 08 */ addi r4, r1, 8
 /* 802F6328 002F3268  38 A0 00 01 */ li r5, 1
-/* 802F632C 002F326C  4B FE 5F 6D */ bl JSUInputStream_NS_read
+/* 802F632C 002F326C  4B FE 5F 6D */ bl read__14JSUInputStreamFPvl
 /* 802F6330 002F3270  88 61 00 08 */ lbz r3, 8(r1)
 /* 802F6334 002F3274  30 03 FF FF */ addic r0, r3, -1
 /* 802F6338 002F3278  7C 00 19 10 */ subfe r0, r0, r3
@@ -167,7 +167,7 @@ lbl_802F630C:
 lbl_802F634C:
 /* 802F634C 002F328C  7F E3 FB 78 */ mr r3, r31
 /* 802F6350 002F3290  38 80 00 04 */ li r4, 4
-/* 802F6354 002F3294  4B FE 60 1D */ bl JSURandomInputStream_NS_align
+/* 802F6354 002F3294  4B FE 60 1D */ bl align__20JSURandomInputStreamFl
 /* 802F6358 002F3298  28 1E 00 00 */ cmplwi r30, 0
 /* 802F635C 002F329C  41 82 00 18 */ beq lbl_802F6374
 /* 802F6360 002F32A0  34 9D 00 DC */ addic. r4, r29, 0xdc
diff --git a/include/JSystem/J2DGraph/J2DPane/asm/func_802F67E0.s b/include/JSystem/J2DGraph/J2DPane/asm/func_802F67E0.s
index 10400656b2..e409a65f95 100644
--- a/include/JSystem/J2DGraph/J2DPane/asm/func_802F67E0.s
+++ b/include/JSystem/J2DGraph/J2DPane/asm/func_802F67E0.s
@@ -306,7 +306,7 @@ lbl_802F6C14:
 /* 802F6C64 002F3BA4  38 81 00 08 */ addi r4, r1, 8
 /* 802F6C68 002F3BA8  4B FF 24 59 */ bl J2DGrafContext_NS_scissor
 /* 802F6C6C 002F3BAC  38 61 00 18 */ addi r3, r1, 0x18
-/* 802F6C70 002F3BB0  4B FF 21 B1 */ bl J2DGrafContext_NS_setScissor
+/* 802F6C70 002F3BB0  4B FF 21 B1 */ bl setScissor__14J2DGrafContextFv
 lbl_802F6C74:
 /* 802F6C74 002F3BB4  88 7B 00 B1 */ lbz r3, 0xb1(r27)
 /* 802F6C78 002F3BB8  48 06 5D 0D */ bl GXSetCullMode
diff --git a/include/JSystem/J2DGraph/J2DPane/asm/func_802F7B18.s b/include/JSystem/J2DGraph/J2DPane/asm/func_802F7B18.s
index ba63797a00..6ad40df918 100644
--- a/include/JSystem/J2DGraph/J2DPane/asm/func_802F7B18.s
+++ b/include/JSystem/J2DGraph/J2DPane/asm/func_802F7B18.s
@@ -14,7 +14,7 @@
 /* 802F7B4C 002F4A8C  7F A3 EB 78 */ mr r3, r29
 /* 802F7B50 002F4A90  38 81 00 08 */ addi r4, r1, 8
 /* 802F7B54 002F4A94  38 A0 00 48 */ li r5, 0x48
-/* 802F7B58 002F4A98  4B FE 47 41 */ bl JSUInputStream_NS_read
+/* 802F7B58 002F4A98  4B FE 47 41 */ bl read__14JSUInputStreamFPvl
 /* 802F7B5C 002F4A9C  A0 01 00 12 */ lhz r0, 0x12(r1)
 /* 802F7B60 002F4AA0  B0 1E 00 04 */ sth r0, 4(r30)
 /* 802F7B64 002F4AA4  88 61 00 14 */ lbz r3, 0x14(r1)
diff --git a/include/JSystem/J2DGraph/J2DPane/asm/func_802F7DB8.s b/include/JSystem/J2DGraph/J2DPane/asm/func_802F7DB8.s
index 9ac46a5794..28a460beaf 100644
--- a/include/JSystem/J2DGraph/J2DPane/asm/func_802F7DB8.s
+++ b/include/JSystem/J2DGraph/J2DPane/asm/func_802F7DB8.s
@@ -14,7 +14,7 @@
 /* 802F7DEC 002F4D2C  40 82 00 14 */ bne lbl_802F7E00
 /* 802F7DF0 002F4D30  38 61 00 08 */ addi r3, r1, 8
 /* 802F7DF4 002F4D34  38 C0 00 00 */ li r6, 0
-/* 802F7DF8 002F4D38  4B FE 62 81 */ bl JUTResReference_NS_getResource
+/* 802F7DF8 002F4D38  4B FE 62 81 */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive
 /* 802F7DFC 002F4D3C  48 00 00 E0 */ b lbl_802F7EDC
 lbl_802F7E00:
 /* 802F7E00 002F4D40  7F 83 E3 78 */ mr r3, r28
@@ -27,16 +27,16 @@ lbl_802F7E00:
 /* 802F7E1C 002F4D5C  7F 84 E3 78 */ mr r4, r28
 /* 802F7E20 002F4D60  7F A5 EB 78 */ mr r5, r29
 /* 802F7E24 002F4D64  38 C0 00 00 */ li r6, 0
-/* 802F7E28 002F4D68  4B FE 62 51 */ bl JUTResReference_NS_getResource
+/* 802F7E28 002F4D68  4B FE 62 51 */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive
 /* 802F7E2C 002F4D6C  28 03 00 00 */ cmplwi r3, 0
 /* 802F7E30 002F4D70  40 82 00 AC */ bne lbl_802F7EDC
 /* 802F7E34 002F4D74  7F 83 E3 78 */ mr r3, r28
 /* 802F7E38 002F4D78  7F E4 FB 78 */ mr r4, r31
 /* 802F7E3C 002F4D7C  38 A0 00 00 */ li r5, 0
-/* 802F7E40 002F4D80  4B FE 46 9D */ bl JSURandomInputStream_NS_seek
+/* 802F7E40 002F4D80  4B FE 46 9D */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom
 /* 802F7E44 002F4D84  80 6D 90 10 */ lwz r3, lbl_80451590-_SDA_BASE_(r13)
 /* 802F7E48 002F4D88  7F 84 E3 78 */ mr r4, r28
-/* 802F7E4C 002F4D8C  48 01 50 31 */ bl J2DDataManage_NS_get_X1_
+/* 802F7E4C 002F4D8C  48 01 50 31 */ bl get__13J2DDataManageFP14JSUInputStream
 /* 802F7E50 002F4D90  48 00 00 8C */ b lbl_802F7EDC
 lbl_802F7E54:
 /* 802F7E54 002F4D94  7F 83 E3 78 */ mr r3, r28
@@ -49,18 +49,18 @@ lbl_802F7E54:
 /* 802F7E70 002F4DB0  7F 84 E3 78 */ mr r4, r28
 /* 802F7E74 002F4DB4  7F A5 EB 78 */ mr r5, r29
 /* 802F7E78 002F4DB8  7F C6 F3 78 */ mr r6, r30
-/* 802F7E7C 002F4DBC  4B FE 61 FD */ bl JUTResReference_NS_getResource
+/* 802F7E7C 002F4DBC  4B FE 61 FD */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive
 /* 802F7E80 002F4DC0  28 03 00 00 */ cmplwi r3, 0
 /* 802F7E84 002F4DC4  40 82 00 28 */ bne lbl_802F7EAC
 /* 802F7E88 002F4DC8  7F 83 E3 78 */ mr r3, r28
 /* 802F7E8C 002F4DCC  7F E4 FB 78 */ mr r4, r31
 /* 802F7E90 002F4DD0  38 A0 00 00 */ li r5, 0
-/* 802F7E94 002F4DD4  4B FE 46 49 */ bl JSURandomInputStream_NS_seek
+/* 802F7E94 002F4DD4  4B FE 46 49 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom
 /* 802F7E98 002F4DD8  38 61 00 08 */ addi r3, r1, 8
 /* 802F7E9C 002F4DDC  7F 84 E3 78 */ mr r4, r28
 /* 802F7EA0 002F4DE0  7F A5 EB 78 */ mr r5, r29
 /* 802F7EA4 002F4DE4  38 C0 00 00 */ li r6, 0
-/* 802F7EA8 002F4DE8  4B FE 61 D1 */ bl JUTResReference_NS_getResource
+/* 802F7EA8 002F4DE8  4B FE 61 D1 */ bl getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive
 lbl_802F7EAC:
 /* 802F7EAC 002F4DEC  28 03 00 00 */ cmplwi r3, 0
 /* 802F7EB0 002F4DF0  40 82 00 2C */ bne lbl_802F7EDC
@@ -70,10 +70,10 @@ lbl_802F7EAC:
 /* 802F7EC0 002F4E00  7F 83 E3 78 */ mr r3, r28
 /* 802F7EC4 002F4E04  7F E4 FB 78 */ mr r4, r31
 /* 802F7EC8 002F4E08  38 A0 00 00 */ li r5, 0
-/* 802F7ECC 002F4E0C  4B FE 46 11 */ bl JSURandomInputStream_NS_seek
+/* 802F7ECC 002F4E0C  4B FE 46 11 */ bl seek__20JSURandomInputStreamFl17JSUStreamSeekFrom
 /* 802F7ED0 002F4E10  80 6D 90 10 */ lwz r3, lbl_80451590-_SDA_BASE_(r13)
 /* 802F7ED4 002F4E14  7F 84 E3 78 */ mr r4, r28
-/* 802F7ED8 002F4E18  48 01 4F A5 */ bl J2DDataManage_NS_get_X1_
+/* 802F7ED8 002F4E18  48 01 4F A5 */ bl get__13J2DDataManageFP14JSUInputStream
 lbl_802F7EDC:
 /* 802F7EDC 002F4E1C  39 61 01 20 */ addi r11, r1, 0x120
 /* 802F7EE0 002F4E20  48 06 A3 45 */ bl _restgpr_28