demangle data-symbols

libs/JSystem/J2DGraph/J2DAnimation.cpp

@@ -42,7 +42,9 @@ struct J3DTextureSRTInfo {};
 
 struct J3DAnmKeyTableBase {};
 
-struct J2DScreen {};
+struct J2DScreen {
+    static u8 mDataManage[4 + 4 /* padding */];
+};
 
 struct J2DResReference {
     /* 8030CF10 */ void getResReference(u16) const;
@@ -189,7 +191,7 @@ extern "C" extern void* __vt__10J2DAnmBase[4];
 extern "C" extern void* __vt__15J2DAnmTransform[5 + 4 /* padding */];
 extern "C" extern void* __vt__10JUTNameTab[3];
 extern "C" extern void* __vt__14J2DAnmVtxColor[5];
-extern "C" extern u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
+extern "C" u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
 
 //
 // Declarations:

libs/JSystem/J2DGraph/J2DAnmLoader.cpp

@@ -73,12 +73,12 @@ struct J2DAnmLoader {
     /* 8030A410 */ ~J2DAnmLoader();
 };
 
+struct J2DAnmColorKey {};
+
 struct J2DAnmBase {
     /* 800569B0 */ void searchUpdateMaterialID(J2DScreen*);
 };
 
-struct J2DAnmColorKey {};
-
 struct J2DAnmKeyLoader_v15 {
     /* 80309290 */ J2DAnmKeyLoader_v15();
     /* 803092AC */ ~J2DAnmKeyLoader_v15();

libs/JSystem/J2DGraph/J2DMaterial.cpp

@@ -82,10 +82,12 @@ struct J2DPEBlock {
     /* 802F1840 */ void setGX();
 };
 
-struct J2DAnmTexPattern {
-    /* 8030BEE8 */ void getTexNo(u16, u16*) const;
-    /* 8030BF9C */ void getResTIMG(u16) const;
-    /* 8030BFF0 */ void getPalette(u16) const;
+struct J2DAnmTextureSRTKey {
+    /* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
+};
+
+struct J2DAnmColor {
+    /* 802EB390 */ void getColor(u16, _GXColor*) const;
 };
 
 struct J2DAnmTevRegKey {
@@ -93,12 +95,10 @@ struct J2DAnmTevRegKey {
     /* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const;
 };
 
-struct J2DAnmColor {
-    /* 802EB390 */ void getColor(u16, _GXColor*) const;
-};
-
-struct J2DAnmTextureSRTKey {
-    /* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
+struct J2DAnmTexPattern {
+    /* 8030BEE8 */ void getTexNo(u16, u16*) const;
+    /* 8030BF9C */ void getResTIMG(u16) const;
+    /* 8030BFF0 */ void getPalette(u16) const;
 };
 
 struct J2DMaterial {

libs/JSystem/J2DGraph/J2DMaterialFactory.cpp

@@ -29,6 +29,10 @@ struct J2DTevStage {
     /* 802F19A8 */ void setTevStageInfo(J2DTevStageInfo const&);
 };
 
+struct J2DScreen {
+    static u8 mDataManage[4 + 4 /* padding */];
+};
+
 struct J2DResReference {
     /* 8030CF10 */ void getResReference(u16) const;
     /* 8030CF44 */ void getName(u16) const;
@@ -146,7 +150,7 @@ extern "C" void strcpy();
 extern "C" extern u8 const j2dDefaultTexCoordInfo[32];
 extern "C" extern u8 const j2dDefaultIndTexMtxInfo[28];
 extern "C" extern u8 const j2dDefaultIndTevStageInfo[12];
-extern "C" extern u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
+extern "C" u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
 extern "C" extern u32 j2dDefaultTevOrderInfoNull;
 extern "C" extern u16 j2dDefaultIndTexOrderNull[1 + 1 /* padding */];
 extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */];

libs/JSystem/J2DGraph/J2DPane.cpp

@@ -17,12 +17,12 @@ struct ResTIMG {};
 
 struct ResFONT {};
 
-struct JKRArchive {};
-
 struct JSUInputStream {
     /* 802DC298 */ void read(void*, s32);
 };
 
+struct JKRArchive {};
+
 struct JUTResReference {
     /* 802DE078 */ void getResource(JSUInputStream*, u32, JKRArchive*);
 };
@@ -54,18 +54,12 @@ struct JGeometry {
     struct TBox2__template0 {};
 };
 
+struct J2DScreen {
+    static u8 mDataManage[4 + 4 /* padding */];
+};
+
 struct J2DRotateAxis {};
 
-struct J2DBasePosition {};
-
-struct J2DAnmVtxColor {};
-
-struct J2DAnmTextureSRTKey {};
-
-struct J2DAnmColor {};
-
-struct J2DAnmBase {};
-
 struct J2DAnmTevRegKey {};
 
 struct J2DAnmTransform {};
@@ -75,10 +69,20 @@ struct J2DGrafContext {
     /* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&);
 };
 
-struct J2DAnmTexPattern {};
+struct J2DAnmVtxColor {};
+
+struct J2DAnmTextureSRTKey {};
+
+struct J2DAnmColor {};
+
+struct J2DBasePosition {};
 
 struct J2DAnmVisibilityFull {};
 
+struct J2DAnmBase {};
+
+struct J2DAnmTexPattern {};
+
 struct J2DPane {
     /* 80020158 */ void setAlpha(u8);
     /* 80053BC0 */ void calcMtx();
@@ -143,6 +147,8 @@ struct J2DPane {
     /* 802F83FC */ void setAnimationVC(J2DAnmVtxColor*);
     /* 802F8464 */ void setConnectParent(bool);
     /* 802F8474 */ void update();
+
+    static f32 static_mBounds[4];
 };
 
 struct J2DOrthoGraph {
@@ -211,6 +217,7 @@ extern "C" void setConnectParent__7J2DPaneFb();
 extern "C" void update__7J2DPaneFv();
 extern "C" void drawSelf__7J2DPaneFff();
 extern "C" void __sinit_J2DPane_cpp();
+extern "C" f32 static_mBounds__7J2DPane[4];
 
 //
 // External References:
@@ -258,7 +265,7 @@ extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
 extern "C" extern void* __vt__14J2DGrafContext[10];
-extern "C" extern u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
+extern "C" u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
 
 //
 // Declarations:
@@ -524,7 +531,7 @@ asm void J2DPane::resize(f32 param_0, f32 param_1) {
 
 /* ############################################################################################## */
 /* 804349B0-804349C0 0616D0 0010+00 2/2 0/0 0/0 .bss             static_mBounds__7J2DPane */
-static f32 static_mBounds__7J2DPane[4];
+f32 J2DPane::static_mBounds[4];
 
 /* 802F7100-802F71DC 2F1A40 00DC+00 0/0 25/25 1/1 .text            getBounds__7J2DPaneFv */
 #pragma push

libs/JSystem/J2DGraph/J2DPicture.cpp

@@ -73,24 +73,26 @@ struct J2DScreen {
     /* 802F9640 */ void getNameResource(char const*);
 };
 
+struct J2DMirror {};
+
 struct J2DBinding {};
 
-struct J2DAnmBase {};
+struct J2DAnmColor {};
 
 struct J2DAnmTevRegKey {};
 
-struct J2DAnmVtxColor {};
+struct J2DAnmVisibilityFull {};
+
+struct J2DAnmBase {};
 
 struct J2DAnmTransform {};
 
+struct J2DAnmVtxColor {};
+
 struct J2DAnmTextureSRTKey {};
 
-struct J2DAnmVisibilityFull {};
-
 struct J2DAnmTexPattern {};
 
-struct J2DAnmColor {};
-
 struct J2DPane {
     /* 80020158 */ void setAlpha(u8);
     /* 80053BC0 */ void calcMtx();
@@ -134,8 +136,6 @@ struct J2DPane {
 
 struct J2DMaterial {};
 
-struct J2DMirror {};
-
 struct J2DPicture {
     /* 800202CC */ void setBlendRatio(f32, f32);
     /* 802FF208 */ void append(JUTTexture*, f32);

libs/JSystem/J2DGraph/J2DPictureEx.cpp

@@ -71,22 +71,20 @@ struct J2DScreen {
     /* 802F9640 */ void getNameResource(char const*);
 };
 
-struct J2DAnmVtxColor {};
-
-struct J2DAnmTextureSRTKey {};
-
-struct J2DAnmColor {};
-
-struct J2DAnmBase {};
-
 struct J2DAnmTevRegKey {};
 
 struct J2DAnmTransform {};
 
+struct J2DAnmVtxColor {};
+
+struct J2DAnmTextureSRTKey {};
+
 struct J2DAnmVisibilityFull {
     /* 8030C048 */ void getVisibility(u16, u8*) const;
 };
 
+struct J2DAnmBase {};
+
 struct J2DPane {
     /* 80053BC0 */ void calcMtx();
     /* 80053C00 */ void makeMatrix(f32, f32);
@@ -114,6 +112,8 @@ struct J2DPane {
 
 struct J2DAnmTexPattern {};
 
+struct J2DAnmColor {};
+
 struct J2DMaterial {
     /* 802EA38C */ void setGX();
     /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);

libs/JSystem/J2DGraph/J2DPrint.cpp

@@ -19,7 +19,9 @@ struct JUTFont {
     /* 802DEDC4 */ void setGradColor(JUtility::TColor, JUtility::TColor);
 };
 
-struct JKRHeap {};
+struct JKRHeap {
+    static u8 sSystemHeap[4];
+};
 
 struct J2DTextBoxVBinding {};
 
@@ -45,6 +47,9 @@ struct J2DPrint {
     /* 802F594C */ void initchar();
     /* 802F59C0 */ void getNumberS32(u8 const**, s32, s32, int);
     /* 802F5AC4 */ void getNumberF32(u8 const**, f32, f32, int);
+
+    static u8 mStrBuff[4];
+    static u8 mStrBuffSize[4];
 };
 
 //
@@ -68,6 +73,8 @@ extern "C" void doEscapeCode__8J2DPrintFPPCUcUc();
 extern "C" void initchar__8J2DPrintFv();
 extern "C" void getNumberS32__8J2DPrintFPPCUclli();
 extern "C" void getNumberF32__8J2DPrintFPPCUcffi();
+extern "C" u8 mStrBuff__8J2DPrint[4];
+extern "C" u8 mStrBuffSize__8J2DPrint[4];
 
 //
 // External References:
@@ -90,7 +97,7 @@ extern "C" void vsnprintf();
 extern "C" void strlen();
 extern "C" void strtol();
 extern "C" void strtoul();
-extern "C" extern u8 sSystemHeap__7JKRHeap[4];
+extern "C" u8 sSystemHeap__7JKRHeap[4];
 
 //
 // Declarations:
@@ -98,13 +105,13 @@ extern "C" extern u8 sSystemHeap__7JKRHeap[4];
 
 /* ############################################################################################## */
 /* 80451580-80451584 000A80 0004+00 3/3 0/0 0/0 .sbss            mStrBuff__8J2DPrint */
-static u8 mStrBuff__8J2DPrint[4];
+u8 J2DPrint::mStrBuff[4];
 
 /* 80451584-80451588 000A84 0004+00 1/1 0/0 0/0 .sbss            None */
 static u8 data_80451584[4];
 
 /* 80451588-8045158C 000A88 0004+00 3/3 0/0 0/0 .sbss            mStrBuffSize__8J2DPrint */
-static u8 mStrBuffSize__8J2DPrint[4];
+u8 J2DPrint::mStrBuffSize[4];
 
 /* 8045158C-80451590 000A8C 0004+00 2/2 0/0 0/0 .sbss            None */
 static u8 data_8045158C[4];

libs/JSystem/J2DGraph/J2DScreen.cpp

@@ -52,15 +52,15 @@ struct JGeometry {
     struct TBox2__template0 {};
 };
 
-struct J2DAnmBase {};
+struct J2DAnmVisibilityFull {};
 
-struct J2DAnmVtxColor {};
+struct J2DAnmBase {};
 
 struct J2DAnmTransform {};
 
 struct J2DGrafContext {};
 
-struct J2DAnmVisibilityFull {};
+struct J2DAnmVtxColor {};
 
 struct J2DPane {
     /* 80020158 */ void setAlpha(u8);
@@ -91,13 +91,13 @@ struct J2DPane {
     /* 802F8478 */ void drawSelf(f32, f32);
 };
 
-struct J2DAnmTexPattern {};
-
-struct J2DAnmTevRegKey {};
+struct J2DAnmTextureSRTKey {};
 
 struct J2DAnmColor {};
 
-struct J2DAnmTextureSRTKey {};
+struct J2DAnmTevRegKey {};
+
+struct J2DAnmTexPattern {};
 
 struct J2DMaterial {
     /* 802EA1AC */ J2DMaterial();
@@ -165,6 +165,8 @@ struct J2DScreen {
     /* 802F9A20 */ void calcMtx();
     /* 802F9A74 */ void setAnimationVF(J2DAnmVisibilityFull*);
     /* 802F9A78 */ void setAnimationVC(J2DAnmVtxColor*);
+
+    static u8 mDataManage[4 + 4 /* padding */];
 };
 
 struct J2DResReference {};
@@ -232,6 +234,7 @@ extern "C" void calcMtx__9J2DScreenFv();
 extern "C" void setAnimation__9J2DScreenFP10J2DAnmBase();
 extern "C" void setAnimationVF__9J2DScreenFP20J2DAnmVisibilityFull();
 extern "C" void setAnimationVC__9J2DScreenFP14J2DAnmVtxColor();
+extern "C" u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
 
 //
 // External References:
@@ -605,8 +608,7 @@ asm void J2DScreen::isUsed(ResFONT const* param_0) {
 
 /* ############################################################################################## */
 /* 80451590-80451598 000A90 0004+04 1/1 3/3 0/0 .sbss            mDataManage__9J2DScreen */
-extern u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
-u8 mDataManage__9J2DScreen[4 + 4 /* padding */];
+u8 J2DScreen::mDataManage[4 + 4 /* padding */];
 
 /* 802F9640-802F9690 2F3F80 0050+00 0/0 6/6 0/0 .text            getNameResource__9J2DScreenFPCc */
 #pragma push

libs/JSystem/J2DGraph/J2DTextBox.cpp

@@ -53,22 +53,22 @@ struct J2DTextBoxVBinding {};
 
 struct J2DTextBoxHBinding {};
 
-struct J2DAnmBase {};
+struct J2DAnmColor {};
 
 struct J2DAnmTevRegKey {};
 
-struct J2DAnmVtxColor {};
+struct J2DAnmVisibilityFull {};
+
+struct J2DAnmBase {};
 
 struct J2DAnmTransform {};
 
+struct J2DAnmVtxColor {};
+
 struct J2DAnmTextureSRTKey {};
 
-struct J2DAnmVisibilityFull {};
-
 struct J2DAnmTexPattern {};
 
-struct J2DAnmColor {};
-
 struct J2DPane {
     /* 80020158 */ void setAlpha(u8);
     /* 80053BC0 */ void calcMtx();

libs/JSystem/J2DGraph/J2DTextBoxEx.cpp

@@ -38,22 +38,22 @@ struct J2DTextBoxVBinding {};
 
 struct J2DTextBoxHBinding {};
 
-struct J2DAnmVtxColor {};
-
-struct J2DAnmTextureSRTKey {};
-
-struct J2DAnmColor {};
-
-struct J2DAnmBase {};
-
 struct J2DAnmTevRegKey {};
 
 struct J2DAnmTransform {};
 
+struct J2DTevStage {};
+
+struct J2DAnmVtxColor {};
+
+struct J2DAnmTextureSRTKey {};
+
 struct J2DAnmVisibilityFull {
     /* 8030C048 */ void getVisibility(u16, u8*) const;
 };
 
+struct J2DAnmBase {};
+
 struct J2DPane {
     /* 80053BC0 */ void calcMtx();
     /* 80053C00 */ void makeMatrix(f32, f32);
@@ -77,10 +77,10 @@ struct J2DPane {
     /* 802F8474 */ void update();
 };
 
-struct J2DTevStage {};
-
 struct J2DAnmTexPattern {};
 
+struct J2DAnmColor {};
+
 struct J2DMaterial {
     /* 802EA38C */ void setGX();
     /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);

libs/JSystem/J2DGraph/J2DWindow.cpp

@@ -57,22 +57,22 @@ struct JGeometry {
     struct TBox2__template0 {};
 };
 
-struct J2DAnmBase {};
+struct J2DAnmColor {};
 
 struct J2DAnmTevRegKey {};
 
-struct J2DAnmVtxColor {};
+struct J2DAnmVisibilityFull {};
+
+struct J2DAnmBase {};
 
 struct J2DAnmTransform {};
 
+struct J2DAnmVtxColor {};
+
 struct J2DAnmTextureSRTKey {};
 
-struct J2DAnmVisibilityFull {};
-
 struct J2DAnmTexPattern {};
 
-struct J2DAnmColor {};
-
 struct J2DPane {
     /* 80020158 */ void setAlpha(u8);
     /* 80053BC0 */ void calcMtx();

libs/JSystem/J2DGraph/J2DWindowEx.cpp

@@ -41,34 +41,24 @@ struct JGeometry {
     struct TBox2__template0 {};
 };
 
+struct J2DAnmTevRegKey {};
+
+struct J2DAnmTransform {};
+
+struct J2DTevStage {};
+
 struct J2DAnmVtxColor {
     /* 8030363C */ void getColor(u8, u16, _GXColor*) const;
 };
 
 struct J2DAnmTextureSRTKey {};
 
-struct J2DWindow {
-    struct TMaterial {};
-
-    /* 802F9A7C */ J2DWindow();
-    /* 802FA880 */ ~J2DWindow();
-    /* 802FB000 */ void resize(f32, f32);
-    /* 802FB1D8 */ void drawSelf(f32, f32);
-    /* 802FBF98 */ s32 getTypeID() const;
-};
-
-struct J2DAnmColor {};
-
-struct J2DAnmBase {};
-
-struct J2DAnmTevRegKey {};
-
-struct J2DAnmTransform {};
-
 struct J2DAnmVisibilityFull {
     /* 8030C048 */ void getVisibility(u16, u8*) const;
 };
 
+struct J2DAnmBase {};
+
 struct J2DPane {
     /* 80053BC0 */ void calcMtx();
     /* 80053C00 */ void makeMatrix(f32, f32);
@@ -95,10 +85,20 @@ struct J2DPane {
     /* 802F8474 */ void update();
 };
 
-struct J2DTevStage {};
-
 struct J2DAnmTexPattern {};
 
+struct J2DAnmColor {};
+
+struct J2DWindow {
+    struct TMaterial {};
+
+    /* 802F9A7C */ J2DWindow();
+    /* 802FA880 */ ~J2DWindow();
+    /* 802FB000 */ void resize(f32, f32);
+    /* 802FB1D8 */ void drawSelf(f32, f32);
+    /* 802FBF98 */ s32 getTypeID() const;
+};
+
 struct J2DMaterial {
     /* 802EA38C */ void setGX();
     /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);

libs/JSystem/J3DGraphAnimator/J3DCluster.cpp

@@ -11,12 +11,14 @@
 // Types:
 //
 
+struct JMath {
+    static f32 asinAcosTable_[1032];
+};
+
 struct J3DVertexBuffer {};
 
 struct J3DModel {};
 
-struct J3DCluster {};
-
 struct J3DAnmCluster {};
 
 struct J3DDeformData {
@@ -29,6 +31,8 @@ struct J3DDeformData {
 
 struct J3DClusterKey {};
 
+struct J3DCluster {};
+
 struct J3DDeformer {
     /* 8032E39C */ J3DDeformer(J3DDeformData*);
     /* 8032EAB4 */ void deform(J3DVertexBuffer*, u16, f32*);
@@ -70,7 +74,7 @@ extern "C" void _restgpr_21();
 extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_29();
-extern "C" extern f32 asinAcosTable___5JMath[1032];
+extern "C" f32 asinAcosTable___5JMath[1032];
 
 //
 // Declarations:

libs/JSystem/J3DGraphAnimator/J3DJoint.cpp

@@ -15,6 +15,12 @@ struct Vec {};
 
 struct J3DTransformInfo {};
 
+struct J3DSys {
+    static u8 mCurrentMtx[48];
+    static f32 mCurrentS[3];
+    static f32 mParentS[3];
+};
+
 struct J3DMtxCalcJ3DSysInitMaya {
     /* 8032ECAC */ void init(Vec const&, f32 const (&)[3][4]);
 };
@@ -35,6 +41,11 @@ struct J3DMtxCalcCalcTransformBasic {
     /* 8032ED30 */ void calcTransform(J3DTransformInfo const&);
 };
 
+struct J3DMtxCalc {
+    static u8 mMtxBuffer[4];
+    static u8 mJoint[4];
+};
+
 struct J3DMaterial {
     /* 80316AB0 */ void setCurrentMtx();
 };
@@ -44,6 +55,12 @@ struct J3DJoint {
     /* 8032F170 */ J3DJoint();
     /* 8032F254 */ void entryIn();
     /* 8032F3F8 */ void recursiveCalc();
+
+    static u8 mCurrentMtxCalc[4 + 4 /* padding */];
+};
+
+struct J3DDrawBuffer {
+    static u8 entryNum[4 + 4 /* padding */];
 };
 
 //
@@ -59,6 +76,9 @@ extern "C" void appendChild__8J3DJointFP8J3DJoint();
 extern "C" void __ct__8J3DJointFv();
 extern "C" void entryIn__8J3DJointFv();
 extern "C" void recursiveCalc__8J3DJointFv();
+extern "C" u8 mMtxBuffer__10J3DMtxCalc[4];
+extern "C" u8 mJoint__10J3DMtxCalc[4];
+extern "C" u8 mCurrentMtxCalc__8J3DJoint[4 + 4 /* padding */];
 
 //
 // External References:
@@ -74,10 +94,10 @@ extern "C" void _savegpr_27();
 extern "C" void _restgpr_27();
 extern "C" extern u8 const j3dDefaultTransformInfo[32];
 extern "C" extern u8 j3dSys[284];
-extern "C" extern u8 mCurrentMtx__6J3DSys[48];
-extern "C" extern f32 mCurrentS__6J3DSys[3];
-extern "C" extern f32 mParentS__6J3DSys[3];
-extern "C" extern u8 entryNum__13J3DDrawBuffer[4 + 4 /* padding */];
+extern "C" u8 mCurrentMtx__6J3DSys[48];
+extern "C" f32 mCurrentS__6J3DSys[3];
+extern "C" f32 mParentS__6J3DSys[3];
+extern "C" u8 entryNum__13J3DDrawBuffer[4 + 4 /* padding */];
 
 //
 // Declarations:
@@ -121,12 +141,10 @@ asm void J3DMtxCalcJ3DSysInitMaya::init(Vec const& param_0, f32 const (&param_1)
 
 /* ############################################################################################## */
 /* 804515F0-804515F4 000AF0 0004+00 3/3 1/1 0/0 .sbss            mMtxBuffer__10J3DMtxCalc */
-extern u8 mMtxBuffer__10J3DMtxCalc[4];
-u8 mMtxBuffer__10J3DMtxCalc[4];
+u8 J3DMtxCalc::mMtxBuffer[4];
 
 /* 804515F4-804515F8 000AF4 0004+00 4/4 9/9 2/2 .sbss            mJoint__10J3DMtxCalc */
-extern u8 mJoint__10J3DMtxCalc[4];
-u8 mJoint__10J3DMtxCalc[4];
+u8 J3DMtxCalc::mJoint[4];
 
 /* 804564A0-804564A4 004AA0 0004+00 3/3 0/0 0/0 .sdata2          @922 */
 SECTION_SDATA2 static f32 lit_922 = 1.0f;
@@ -218,8 +236,7 @@ asm void J3DJoint::entryIn() {
 
 /* ############################################################################################## */
 /* 804515F8-80451600 000AF8 0004+04 1/1 1/1 0/0 .sbss            mCurrentMtxCalc__8J3DJoint */
-extern u8 mCurrentMtxCalc__8J3DJoint[4 + 4 /* padding */];
-u8 mCurrentMtxCalc__8J3DJoint[4 + 4 /* padding */];
+u8 J3DJoint::mCurrentMtxCalc[4 + 4 /* padding */];
 
 /* 8032F3F8-8032F5A8 329D38 01B0+00 0/0 1/1 0/0 .text            recursiveCalc__8J3DJointFv */
 #pragma push

libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp

@@ -19,6 +19,8 @@ struct J3DMtxBuffer {};
 
 struct J3DMtxCalc {
     /* 80325D1C */ void setMtxBuffer(J3DMtxBuffer*);
+
+    static u8 mMtxBuffer[4];
 };
 
 struct J3DModelHierarchy {};
@@ -28,6 +30,8 @@ struct J3DMaterialTable {};
 struct J3DJoint {
     /* 8032F13C */ void appendChild(J3DJoint*);
     /* 8032F3F8 */ void recursiveCalc();
+
+    static u8 mCurrentMtxCalc[4 + 4 /* padding */];
 };
 
 struct J3DJointTree {
@@ -67,8 +71,8 @@ extern "C" void appendChild__8J3DJointFP8J3DJoint();
 extern "C" void recursiveCalc__8J3DJointFv();
 extern "C" void _savegpr_23();
 extern "C" void _restgpr_23();
-extern "C" extern u8 mMtxBuffer__10J3DMtxCalc[4];
-extern "C" extern u8 mCurrentMtxCalc__8J3DJoint[4 + 4 /* padding */];
+extern "C" u8 mMtxBuffer__10J3DMtxCalc[4];
+extern "C" u8 mCurrentMtxCalc__8J3DJoint[4 + 4 /* padding */];
 
 //
 // Declarations:

libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp

@@ -25,10 +25,10 @@ struct J3DTevKColorAnm {};
 
 struct J3DTevColorAnm {};
 
-struct J3DMaterial {};
-
 struct J3DMatColorAnm {};
 
+struct J3DMaterial {};
+
 struct J3DMaterialAnm {
     /* 800A4820 */ ~J3DMaterialAnm();
     /* 8032C320 */ void initialize();

libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp

@@ -23,12 +23,12 @@ struct J3DTevKColorAnm {};
 
 struct J3DTevColorAnm {};
 
-struct J3DAnmTevRegKey {};
-
 struct J3DAnmColor {};
 
 struct J3DAnmTexPattern {};
 
+struct J3DAnmTevRegKey {};
+
 struct J3DAnmTextureSRTKey {};
 
 struct J3DMaterialTable {

libs/JSystem/J3DGraphAnimator/J3DModel.cpp

@@ -13,11 +13,16 @@
 
 struct Vec {};
 
+struct J3DModel;
+struct J3DDeformData {
+    /* 8032E230 */ void offAllFlag(u32);
+    /* 8032E274 */ void deform(J3DModel*);
+};
+
 struct J3DModelData {
     /* 803260F8 */ void syncJ3DSysFlags() const;
 };
 
-struct J3DModel;
 struct J3DSkinDeform {
     /* 8032C9B0 */ void initSkinInfo(J3DModelData*);
     /* 8032CF44 */ void initMtxIndexArray(J3DModelData*);
@@ -26,11 +31,6 @@ struct J3DSkinDeform {
     /* 8032DFDC */ void deform(J3DModel*);
 };
 
-struct J3DDeformData {
-    /* 8032E230 */ void offAllFlag(u32);
-    /* 8032E274 */ void deform(J3DModel*);
-};
-
 struct J3DModel {
     /* 80327100 */ void initialize();
     /* 80327184 */ void entryModelData(J3DModelData*, u32, u32);

libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp

@@ -31,6 +31,11 @@ struct J3DMtxBuffer {
     /* 80326ACC */ void calcDrawMtx(u32, Vec const&, f32 const (&)[3][4]);
     /* 80326D3C */ void calcNrmMtx();
     /* 80326EF0 */ void calcBBoardMtx();
+
+    static u8 sNoUseDrawMtx[48];
+    static u8 sNoUseNrmMtx[36 + 4 /* padding */];
+    static void* sNoUseDrawMtxPtr;
+    static void* sNoUseNrmMtxPtr;
 };
 
 //
@@ -49,6 +54,10 @@ extern "C" void calcDrawMtx__12J3DMtxBufferFUlRC3VecRA3_A4_Cf();
 extern "C" void calcNrmMtx__12J3DMtxBufferFv();
 extern "C" void calcBBoardMtx__12J3DMtxBufferFv();
 extern "C" void J3DCalcViewBaseMtx__FPA4_fRC3VecRA3_A4_CfPA4_f();
+extern "C" u8 sNoUseDrawMtx__12J3DMtxBuffer[48];
+extern "C" u8 sNoUseNrmMtx__12J3DMtxBuffer[36 + 4 /* padding */];
+extern "C" void* sNoUseDrawMtxPtr__12J3DMtxBuffer;
+extern "C" void* sNoUseNrmMtxPtr__12J3DMtxBuffer;
 
 //
 // External References:
@@ -123,16 +132,16 @@ asm void J3DMtxBuffer::createWeightEnvelopeMtx(J3DModelData* param_0) {
 
 /* ############################################################################################## */
 /* 804371C0-804371F0 063EE0 0030+00 1/0 0/0 0/0 .bss             sNoUseDrawMtx__12J3DMtxBuffer */
-static u8 sNoUseDrawMtx__12J3DMtxBuffer[48];
+u8 J3DMtxBuffer::sNoUseDrawMtx[48];
 
 /* 804371F0-80437218 063F10 0024+04 1/0 0/0 0/0 .bss             sNoUseNrmMtx__12J3DMtxBuffer */
-static u8 sNoUseNrmMtx__12J3DMtxBuffer[36 + 4 /* padding */];
+u8 J3DMtxBuffer::sNoUseNrmMtx[36 + 4 /* padding */];
 
 /* 80450970-80450974 -00001 0004+00 1/1 0/0 0/0 .sdata           sNoUseDrawMtxPtr__12J3DMtxBuffer */
-SECTION_SDATA static void* sNoUseDrawMtxPtr__12J3DMtxBuffer = (void*)&sNoUseDrawMtx__12J3DMtxBuffer;
+SECTION_SDATA void* J3DMtxBuffer::sNoUseDrawMtxPtr = (void*)&J3DMtxBuffer::sNoUseDrawMtx;
 
 /* 80450974-80450978 -00001 0004+00 1/1 0/0 0/0 .sdata           sNoUseNrmMtxPtr__12J3DMtxBuffer */
-SECTION_SDATA static void* sNoUseNrmMtxPtr__12J3DMtxBuffer = (void*)&sNoUseNrmMtx__12J3DMtxBuffer;
+SECTION_SDATA void* J3DMtxBuffer::sNoUseNrmMtxPtr = (void*)&J3DMtxBuffer::sNoUseNrmMtx;
 
 /* 8032648C-803264B8 320DCC 002C+00 1/1 0/0 0/0 .text            setNoUseDrawMtx__12J3DMtxBufferFv
  */