project cleanup (#2895)

* some wii OS fixes * remove old dol2asm comments * remove dol2asm.h * remove function address comments * normalize ATTRIBUTE_ALIGN usage * DECL_WEAK macro * fix gcc attribute weak macro * wrap more mwcc specific things in ifdefs * fixes * fix revo sdk version flags * fixes
2026-08-17 20:43:07 -04:00 · 2025-11-30 14:23:42 -08:00
parent 434415337d
commit a6e76c0841
2375 changed files with 24683 additions and 71069 deletions
@@ -4,7 +4,6 @@
 #include "JSystem/J3DGraphBase/J3DStruct.h"
 #include "JSystem/JMath/JMath.h"

-/* 803283FC-8032842C 322D3C 0030+00 0/0 25/25 285/285 .text            init__12J3DFrameCtrlFs */
 void J3DFrameCtrl::init(s16 endFrame) {
    mAttribute = EMode_LOOP;
    mState = 0;
@@ -15,8 +14,6 @@ void J3DFrameCtrl::init(s16 endFrame) {
    mFrame = 0.0f;
 }

-/* 8032842C-803289CC 322D6C 05A0+00 0/0 92/92 382/382 .text            checkPass__12J3DFrameCtrlFf
- */
 int J3DFrameCtrl::checkPass(f32 passFrame) {
    f32 next_frame = mFrame + mRate;

@@ -135,7 +132,6 @@ int J3DFrameCtrl::checkPass(f32 passFrame) {
 }


-/* 803289CC-80328E40 32330C 0474+00 0/0 3/3 0/0 .text            update__12J3DFrameCtrlFv */
 void J3DFrameCtrl::update() {
    mState = 0;
    mFrame += mRate;
@@ -206,7 +202,6 @@ void J3DFrameCtrl::update() {
    }
 }

-/* 80328E40-80328E90 323780 0050+00 0/0 3/3 0/0 .text            __ct__15J3DAnmTransformFsPfPsPf */
 J3DAnmTransform::J3DAnmTransform(s16 frameMax, f32* pScaleData, s16* pRotData, f32* pTransData)
 : J3DAnmBase(frameMax) {
    mScaleData = pScaleData;
@@ -218,8 +213,6 @@ J3DAnmTransform::J3DAnmTransform(s16 frameMax, f32* pScaleData, s16* pRotData, f
    field_0x1e = 0;
 }

-/* 80328E90-803291F0 3237D0 0360+00 1/0 0/0 0/0 .text
- * getTransform__19J3DAnmTransformFullCFUsP16J3DTransformInfo   */
 void J3DAnmTransformFull::getTransform(u16 jointNo, J3DTransformInfo* pTransform) const {
    J3D_ASSERT_RANGE(317, jointNo >= 0 && jointNo < field_0x1e);
    J3D_ASSERT_NULLPTR(318, pTransform != NULL);
@@ -310,8 +303,6 @@ void J3DAnmTransformFull::getTransform(u16 jointNo, J3DTransformInfo* pTransform
    }
 }

-/* 803291F0-80329A34 323B30 0844+00 1/0 0/0 0/0 .text
- * getTransform__27J3DAnmTransformFullWithLerpCFUsP16J3DTransformInfo */
 void J3DAnmTransformFullWithLerp::getTransform(u16 jointNo, J3DTransformInfo* pTransform) const {
    J3D_ASSERT_RANGE(421, jointNo >= 0 && jointNo < field_0x1e);
    J3D_ASSERT_NULLPTR(422, pTransform != NULL);
@@ -520,6 +511,7 @@ inline f32 J3DHermiteInterpolation(register f32 pp1, register s16 const* pp2,
                                   register s16 const* pp3, register s16 const* pp4,
                                   register s16 const* pp5, register s16 const* pp6,
                                   register s16 const* pp7) {
+#ifdef __MWERKS__
    register f32 p1 = pp1;
    register f32 ff8;
    register f32 ff7;
@@ -561,6 +553,7 @@ inline f32 J3DHermiteInterpolation(register f32 pp1, register s16 const* pp2,
    }
    // clang-format on
    return fout;
+#endif
 }

 template<typename T>
@@ -614,8 +607,6 @@ f32 J3DGetKeyFrameInterpolation(f32 frame, J3DAnmKeyTableBase* pKeyTable, T* pDa
    }
 }

-/* 80329A34-80329E5C 324374 0428+00 0/0 1/1 0/0 .text
- * calcTransform__18J3DAnmTransformKeyCFfUsP16J3DTransformInfo  */
 void J3DAnmTransformKey::calcTransform(f32 frame, u16 jointNo, J3DTransformInfo* pTransform) const {
    J3D_ASSERT_RANGE(829, jointNo >= 0 && jointNo < field_0x1e);
    J3D_ASSERT_NULLPTR(830, pTransform != NULL);
@@ -734,7 +725,6 @@ void J3DAnmTransformKey::calcTransform(f32 frame, u16 jointNo, J3DTransformInfo*
    }
 }

-/* 80329E5C-80329F14 32479C 00B8+00 0/0 2/2 0/0 .text            __ct__19J3DAnmTextureSRTKeyFv */
 J3DAnmTextureSRTKey::J3DAnmTextureSRTKey() {
    mDecShift = 0;
    mTrackNum = mScaleNum = mRotNum = mTransNum = 0;
@@ -748,8 +738,6 @@ J3DAnmTextureSRTKey::J3DAnmTextureSRTKey() {
    mTexMtxCalcType = 0;
 }

-/* 80329F14-8032A184 324854 0270+00 0/0 1/1 0/0 .text
- * calcTransform__19J3DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo */
 void J3DAnmTextureSRTKey::calcTransform(f32 frame, u16 jointNo, J3DTextureSRTInfo* pTexSRTInfo) const {
    J3D_ASSERT_RANGE(992, jointNo >= 0 && jointNo < mTrackNum);
    J3D_ASSERT_NULLPTR(993, pTexSRTInfo != NULL);
@@ -820,8 +808,6 @@ void J3DAnmTextureSRTKey::calcTransform(f32 frame, u16 jointNo, J3DTextureSRTInf
    }
 }

-/* 8032A184-8032A218 324AC4 0094+00 1/0 0/0 0/0 .text            getWeight__17J3DAnmClusterFullCFUs
- */
 f32 J3DAnmClusterFull::getWeight(u16 index) const {
    int maxFrame = mAnmTable[index].mMaxFrame;
    int frame = (int)(mFrame + 0.5f);
@@ -835,8 +821,6 @@ f32 J3DAnmClusterFull::getWeight(u16 index) const {
    }
 }

-/* 8032A218-8032A29C 324B58 0084+00 1/0 0/0 0/0 .text            getWeight__16J3DAnmClusterKeyCFUs
- */
 f32 J3DAnmClusterKey::getWeight(u16 index) const {
    int maxFrame = (u16)mAnmTable[index].mWeightTable.mMaxFrame;
    switch (maxFrame) {
@@ -850,7 +834,6 @@ f32 J3DAnmClusterKey::getWeight(u16 index) const {
    }
 }

-/* 8032A29C-8032A30C 324BDC 0070+00 2/2 0/0 0/0 .text            __ct__14J3DAnmVtxColorFv */
 J3DAnmVtxColor::J3DAnmVtxColor() {
    for (int i = 0; i < 2; i++) {
        mAnmTableNum[i] = 0;
@@ -860,15 +843,12 @@ J3DAnmVtxColor::J3DAnmVtxColor() {
    }
 }

-/* 8032A30C-8032A368 324C4C 005C+00 0/0 1/1 0/0 .text            __ct__18J3DAnmVtxColorFullFv */
 J3DAnmVtxColorFull::J3DAnmVtxColorFull() {
    for (int i = 0; i < 2; i++) {
        mpTable[i] = NULL;
    }
 }

-/* 8032A368-8032A4E0 324CA8 0178+00 1/0 0/0 0/0 .text
- * getColor__18J3DAnmVtxColorFullCFUcUsP8_GXColor               */
 void J3DAnmVtxColorFull::getColor(u8 tableNo, u16 index, GXColor* pColor) const {
    J3D_ASSERT_NULLPTR(1254, pColor != NULL);
    J3DAnmColorFullTable* entry = &mpTable[tableNo][index];
@@ -912,15 +892,12 @@ void J3DAnmVtxColorFull::getColor(u8 tableNo, u16 index, GXColor* pColor) const
    }
 }

-/* 8032A4E0-8032A53C 324E20 005C+00 0/0 1/1 0/0 .text            __ct__17J3DAnmVtxColorKeyFv */
 J3DAnmVtxColorKey::J3DAnmVtxColorKey() {
    for (int i = 0; i < 2; i++) {
        mpTable[i] = 0;
    }
 }

-/* 8032A53C-8032A828 324E7C 02EC+00 1/0 0/0 0/0 .text
- * getColor__17J3DAnmVtxColorKeyCFUcUsP8_GXColor                */
 void J3DAnmVtxColorKey::getColor(u8 tableNo, u16 index, GXColor* pColor) const {
    J3D_ASSERT_NULLPTR(1338, pColor != NULL);
    J3DAnmColorKeyTable* entry = &mpTable[tableNo][index];
@@ -1003,13 +980,10 @@ void J3DAnmVtxColorKey::getColor(u8 tableNo, u16 index, GXColor* pColor) const {
    }
 }

-/* 8032A828-8032A8A4 325168 007C+00 2/2 0/0 0/0 .text            __ct__11J3DAnmColorFv */
 J3DAnmColor::J3DAnmColor() : field_0xc(0), field_0xe(0), field_0x10(0),
    field_0x12(0), mUpdateMaterialNum(0), mUpdateMaterialID(NULL) {}


-/* 8032A8A4-8032A93C 3251E4 0098+00 0/0 1/1 0/0 .text
- * searchUpdateMaterialID__11J3DAnmColorFP16J3DMaterialTable    */
 void J3DAnmColor::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
    for (u16 i = 0; i < mUpdateMaterialNum; i++) {
        int index = pMatTable->getMaterialName()->getIndex(mUpdateMaterialName.getName(i));
@@ -1021,7 +995,6 @@ void J3DAnmColor::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
    }
 }

-/* 8032A93C-8032A990 32527C 0054+00 0/0 1/1 0/0 .text            __ct__15J3DAnmColorFullFv */
 J3DAnmColorFull::J3DAnmColorFull() {
    mColorR = NULL;
    mColorG = NULL;
@@ -1030,7 +1003,6 @@ J3DAnmColorFull::J3DAnmColorFull() {
    mAnmTable = NULL;
 }

-/* 8032A990-8032AB00 3252D0 0170+00 1/0 0/0 0/0 .text getColor__15J3DAnmColorFullCFUsP8_GXColor */
 void J3DAnmColorFull::getColor(u16 index, GXColor* pColor) const {
    J3D_ASSERT_RANGE(1537, index >= 0 && index < mUpdateMaterialNum);
    J3D_ASSERT_NULLPTR(1538, pColor != NULL);
@@ -1075,7 +1047,6 @@ void J3DAnmColorFull::getColor(u16 index, GXColor* pColor) const {
    }
 }

-/* 8032AB00-8032AB54 325440 0054+00 0/0 1/1 0/0 .text            __ct__14J3DAnmColorKeyFv */
 J3DAnmColorKey::J3DAnmColorKey() {
    mColorR = NULL;
    mColorG = NULL;
@@ -1084,7 +1055,6 @@ J3DAnmColorKey::J3DAnmColorKey() {
    mAnmTable = NULL;
 }

-/* 8032AB54-8032AE18 325494 02C4+00 1/0 0/0 0/0 .text getColor__14J3DAnmColorKeyCFUsP8_GXColor */
 void J3DAnmColorKey::getColor(u16 index, GXColor* pColor) const {
    J3D_ASSERT_RANGE(1614, index >= 0 && index < mUpdateMaterialNum);
    J3D_ASSERT_NULLPTR(1615, pColor != NULL);
@@ -1168,7 +1138,6 @@ void J3DAnmColorKey::getColor(u16 index, GXColor* pColor) const {
    }
 }

-/* 8032AE18-8032AED8 325758 00C0+00 0/0 1/1 0/0 .text            __ct__15J3DAnmTevRegKeyFv */
 J3DAnmTevRegKey::J3DAnmTevRegKey() {
    mCRegUpdateMaterialNum = mKRegUpdateMaterialNum = 0;

@@ -1196,11 +1165,9 @@ J3DAnmTevRegKey::J3DAnmTevRegKey() {
 }


-/* 8032AED8-8032AF50 325818 0078+00 0/0 2/2 0/0 .text            __ct__16J3DAnmTexPatternFv */
 J3DAnmTexPattern::J3DAnmTexPattern() : mTextureIndex(NULL), mAnmTable(NULL),
    field_0x14(0), mUpdateMaterialNum(0), mUpdateMaterialID(NULL) {}

-/* 8032AF50-8032B004 325890 00B4+00 0/0 1/1 72/72 .text getTexNo__16J3DAnmTexPatternCFUsPUs */
 void J3DAnmTexPattern::getTexNo(u16 index, u16* pTexNo) const {
    u32 maxFrame = mAnmTable[index].mMaxFrame;
    J3D_ASSERT_RANGE(1743, index >= 0 && index < mUpdateMaterialNum);
@@ -1215,8 +1182,6 @@ void J3DAnmTexPattern::getTexNo(u16 index, u16* pTexNo) const {
    }
 }

-/* 8032B004-8032B09C 325944 0098+00 1/1 1/1 0/0 .text
- * searchUpdateMaterialID__16J3DAnmTexPatternFP16J3DMaterialTable */
 void J3DAnmTexPattern::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
    J3D_ASSERT_NULLPTR(1790, pMatTable != NULL);

@@ -1230,15 +1195,11 @@ void J3DAnmTexPattern::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
    }
 }

-/* 8032B09C-8032B0C0 3259DC 0024+00 0/0 4/4 1/1 .text
- * searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData   */
 void J3DAnmTexPattern::searchUpdateMaterialID(J3DModelData* pModelData) {
    J3D_ASSERT_NULLPTR(1813, pModelData != NULL);
    searchUpdateMaterialID(&pModelData->getMaterialTable());
 }

-/* 8032B0C0-8032B1D4 325A00 0114+00 1/1 1/1 0/0 .text
- * searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP16J3DMaterialTable */
 void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
    J3D_ASSERT_NULLPTR(1832, pMatTable != NULL);

@@ -1261,15 +1222,11 @@ void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
    }
 }

-/* 8032B1D4-8032B1F8 325B14 0024+00 0/0 8/8 6/6 .text
- * searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData */
 void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DModelData* pModelData) {
    J3D_ASSERT_NULLPTR(1871, pModelData != NULL);
    searchUpdateMaterialID(&pModelData->getMaterialTable());
 }

-/* 8032B1F8-8032B4BC 325B38 02C4+00 0/0 2/2 1/1 .text
- * getTevColorReg__15J3DAnmTevRegKeyCFUsP11_GXColorS10          */
 void J3DAnmTevRegKey::getTevColorReg(u16 index, GXColorS10* pColor) const {
    J3D_ASSERT_RANGE(1887, index >= 0 && index < mCRegUpdateMaterialNum);
    J3D_ASSERT_NULLPTR(1888, pColor != NULL);
@@ -1353,8 +1310,6 @@ void J3DAnmTevRegKey::getTevColorReg(u16 index, GXColorS10* pColor) const {
    }
 }

-/* 8032B4BC-8032B780 325DFC 02C4+00 0/0 1/1 1/1 .text
- * getTevKonstReg__15J3DAnmTevRegKeyCFUsP8_GXColor              */
 void J3DAnmTevRegKey::getTevKonstReg(u16 index, GXColor* pColor) const {
    J3D_ASSERT_RANGE(1989, index >= 0 && index < mKRegUpdateMaterialNum);
    J3D_ASSERT_NULLPTR(1990, pColor != NULL);
@@ -1438,8 +1393,6 @@ void J3DAnmTevRegKey::getTevKonstReg(u16 index, GXColor* pColor) const {
    }
 }

-/* 8032B780-8032B87C 3260C0 00FC+00 1/1 1/1 0/0 .text
- * searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable */
 void J3DAnmTevRegKey::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
    J3D_ASSERT_NULLPTR(2083, pMatTable != NULL);

@@ -1462,8 +1415,6 @@ void J3DAnmTevRegKey::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
    }
 }

-/* 8032B87C-8032B8A0 3261BC 0024+00 0/0 9/9 4/4 .text
- * searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData    */
 void J3DAnmTevRegKey::searchUpdateMaterialID(J3DModelData* pModelData) {
    J3D_ASSERT_NULLPTR(2119, pModelData != NULL);
    searchUpdateMaterialID(&pModelData->getMaterialTable());
@@ -6,7 +6,6 @@
 #include "JSystem/JMath/JMATrigonometric.h"
 #include "dolphin/base/PPCArch.h"

-/* 8032E1F8-8032E230 328B38 0038+00 0/0 1/1 0/0 .text            __ct__13J3DDeformDataFv */
 J3DDeformData::J3DDeformData() {
    mClusterNum = 0;
    mClusterKeyNum = 0;
@@ -22,23 +21,18 @@ J3DDeformData::J3DDeformData() {
    mClusterKeyName = NULL;
 }

-/* 8032E230-8032E274 328B70 0044+00 0/0 1/1 0/0 .text            offAllFlag__13J3DDeformDataFUl */
 void J3DDeformData::offAllFlag(u32 i_flag) {
    for (u16 i = 0; i < mClusterNum; i++) {
        mClusterPointer[i].getDeformer()->offFlag(i_flag);
    }
 }

-/* 8032E274-8032E298 328BB4 0024+00 0/0 1/1 0/0 .text            deform__13J3DDeformDataFP8J3DModel
- */
 void J3DDeformData::deform(J3DModel* model) {
    J3D_ASSERT_NULLPTR(110, model);

    deform(model->getVertexBuffer());
 }

-/* 8032E298-8032E364 328BD8 00CC+00 1/1 0/0 0/0 .text deform__13J3DDeformDataFP15J3DVertexBuffer
- */
 void J3DDeformData::deform(J3DVertexBuffer* buffer) {
    J3D_ASSERT_NULLPTR(141, buffer);

@@ -59,14 +53,12 @@ void J3DDeformData::deform(J3DVertexBuffer* buffer) {
    buffer->setCurrentVtxNrm(buffer->getVtxNrmArrayPointer(0));
 }

-/* 8032E364-8032E39C 328CA4 0038+00 0/0 1/1 0/0 .text setAnm__13J3DDeformDataFP13J3DAnmCluster */
 void J3DDeformData::setAnm(J3DAnmCluster* anm) {
    for (u16 i = 0; i < mClusterNum; i++) {
        mClusterPointer[i].getDeformer()->setAnmCluster(anm);
    }
 }

-/* 8032E39C-8032E3BC 328CDC 0020+00 0/0 1/1 0/0 .text __ct__11J3DDeformerFP13J3DDeformData */
 J3DDeformer::J3DDeformer(J3DDeformData* data) {
    mDeformData = data;
    mAnmCluster = NULL;
@@ -75,8 +67,6 @@ J3DDeformer::J3DDeformer(J3DDeformData* data) {
    mFlags = 3;
 }

-/* 8032E3BC-8032E4A4 328CFC 00E8+00 1/1 0/0 0/0 .text deform__11J3DDeformerFP15J3DVertexBufferUs
- */
 void J3DDeformer::deform(J3DVertexBuffer* buffer, u16 param_1) {
    J3D_ASSERT_NULLPTR(222, buffer);

@@ -95,8 +85,6 @@ void J3DDeformer::deform(J3DVertexBuffer* buffer, u16 param_1) {
    }
 }

-/* 8032E4A4-8032E60C 328DE4 0168+00 1/1 0/0 0/0 .text
- * deform_VtxPosF32__11J3DDeformerFP15J3DVertexBufferP10J3DClusterP13J3DClusterKeyPf */
 void J3DDeformer::deform_VtxPosF32(J3DVertexBuffer* i_buffer, J3DCluster* i_cluster,
                                   J3DClusterKey* i_key, f32* i_weights) {
    J3DClusterKey* key;
@@ -137,8 +125,6 @@ void J3DDeformer::deform_VtxPosF32(J3DVertexBuffer* i_buffer, J3DCluster* i_clus
    }
 }

-/* 8032E60C-8032EAB4 328F4C 04A8+00 1/1 0/0 0/0 .text
- * deform_VtxNrmF32__11J3DDeformerFP15J3DVertexBufferP10J3DClusterP13J3DClusterKeyPf */
 // NONMATCHING one missing mr
 void J3DDeformer::deform_VtxNrmF32(J3DVertexBuffer* i_buffer, J3DCluster* i_cluster,
                                   J3DClusterKey* i_key, f32* i_weights) {
@@ -238,8 +224,6 @@ void J3DDeformer::deform_VtxNrmF32(J3DVertexBuffer* i_buffer, J3DCluster* i_clus
    }
 }

-/* 8032EAB4-8032EBCC 3293F4 0118+00 1/1 0/0 0/0 .text deform__11J3DDeformerFP15J3DVertexBufferUsPf
- */
 void J3DDeformer::deform(J3DVertexBuffer* i_buffer, u16 param_1, f32* i_weights) {
    J3D_ASSERT_NULLPTR(505, i_buffer != NULL);

@@ -268,8 +252,6 @@ void J3DDeformer::deform(J3DVertexBuffer* i_buffer, u16 param_1, f32* i_weights)
    }
 }

-/* 8032EBCC-8032EC28 32950C 005C+00 1/1 0/0 0/0 .text            normalizeWeight__11J3DDeformerFiPf
- */
 void J3DDeformer::normalizeWeight(int i_keyNum, f32* i_weights) {
    f32 totalWeight = 0.0f;
    for (u16 i = 0; i < i_keyNum; i++) {
@@ -8,8 +8,6 @@
 #include "JSystem/JMath/JMath.h"
 #include "m_Do/m_Do_mtx.h"

-/* 8032EC28-8032ECAC 329568 0084+00 0/0 1/1 0/0 .text
- * init__25J3DMtxCalcJ3DSysInitBasicFRC3VecRA3_A4_Cf            */
 void J3DMtxCalcJ3DSysInitBasic::init(Vec const& scale, Mtx const& mtx) {
    J3DSys::mCurrentS = scale;
    J3DSys::mParentS = (Vec){1.0f, 1.0f, 1.0f};
@@ -17,8 +15,6 @@ void J3DMtxCalcJ3DSysInitBasic::init(Vec const& scale, Mtx const& mtx) {
                     J3DSys::mCurrentS.z);
 }

-/* 8032ECAC-8032ED30 3295EC 0084+00 0/0 2/2 2/2 .text
- * init__24J3DMtxCalcJ3DSysInitMayaFRC3VecRA3_A4_Cf             */
 void J3DMtxCalcJ3DSysInitMaya::init(Vec const& scale, Mtx const& mtx) {
    J3DSys::mParentS = (Vec){1.0f, 1.0f, 1.0f};
    J3DSys::mCurrentS = scale;
@@ -26,10 +22,8 @@ void J3DMtxCalcJ3DSysInitMaya::init(Vec const& scale, Mtx const& mtx) {
                     J3DSys::mCurrentS.z);
 }

-/* 804515F0-804515F4 000AF0 0004+00 3/3 1/1 0/0 .sbss            mMtxBuffer__10J3DMtxCalc */
 J3DMtxBuffer* J3DMtxCalc::mMtxBuffer;

-/* 804515F4-804515F8 000AF4 0004+00 4/4 9/9 2/2 .sbss            mJoint__10J3DMtxCalc */
 J3DJoint* J3DMtxCalc::mJoint;

 inline s32 checkScaleOne(const Vec& param_0) {
@@ -40,8 +34,6 @@ inline s32 checkScaleOne(const Vec& param_0) {
    }
 }

-/* 8032ED30-8032EE50 329670 0120+00 0/0 1/1 0/0 .text
- * calcTransform__28J3DMtxCalcCalcTransformBasicFRC16J3DTransformInfo */
 void J3DMtxCalcCalcTransformBasic::calcTransform(J3DTransformInfo const& transInfo) {
    J3DMtxBuffer* mtxBuf = J3DMtxCalc::getMtxBuffer();
    u16 jntNo = J3DMtxCalc::getJoint()->getJntNo();
@@ -65,8 +57,6 @@ void J3DMtxCalcCalcTransformBasic::calcTransform(J3DTransformInfo const& transIn
    MTXCopy(J3DSys::mCurrentMtx, anmMtx);
 }

-/* 8032EE50-8032EFBC 329790 016C+00 0/0 1/1 0/0 .text
- * calcTransform__32J3DMtxCalcCalcTransformSoftimageFRC16J3DTransformInfo */
 void J3DMtxCalcCalcTransformSoftimage::calcTransform(J3DTransformInfo const& transInfo) {
    J3DMtxBuffer* mtxBuf = J3DMtxCalc::getMtxBuffer();
    u16 jntNo = J3DMtxCalc::getJoint()->getJntNo();
@@ -96,8 +86,6 @@ void J3DMtxCalcCalcTransformSoftimage::calcTransform(J3DTransformInfo const& tra
    }
 }

-/* 8032EFBC-8032F13C 3298FC 0180+00 0/0 6/6 2/2 .text
- * calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo */
 void J3DMtxCalcCalcTransformMaya::calcTransform(J3DTransformInfo const& transInfo) {
    J3DJoint* joint = J3DMtxCalc::getJoint();
    J3DMtxBuffer* mtxBuf = J3DMtxCalc::getMtxBuffer();
@@ -140,8 +128,6 @@ void J3DMtxCalcCalcTransformMaya::calcTransform(J3DTransformInfo const& transInf
    J3DSys::mParentS.z = transInfo.mScale.z;
 }

-/* 8032F13C-8032F170 329A7C 0034+00 0/0 1/1 0/0 .text            appendChild__8J3DJointFP8J3DJoint
- */
 void J3DJoint::appendChild(J3DJoint* pChild) {
    if (mChild == NULL) {
        mChild = pChild;
@@ -154,7 +140,6 @@ void J3DJoint::appendChild(J3DJoint* pChild) {
    }
 }

-/* 8032F170-8032F254 329AB0 00E4+00 0/0 1/1 0/0 .text            __ct__8J3DJointFv */
 J3DJoint::J3DJoint() {
    mCallBackUserData = NULL;
    mCallBack = NULL;
@@ -175,7 +160,6 @@ J3DJoint::J3DJoint() {
    mMax = init2;
 }

-/* 8032F254-8032F3F8 329B94 01A4+00 0/0 1/1 0/0 .text            entryIn__8J3DJointFv */
 void J3DJoint::entryIn() {
    MtxP anmMtx = j3dSys.getModel()->getAnmMtx(mJntNo);
    j3dSys.getDrawBuffer(0)->setZMtx(anmMtx);
@@ -208,10 +192,8 @@ void J3DJoint::entryIn() {
    }
 }

-/* 804515F8-80451600 000AF8 0004+04 1/1 1/1 0/0 .sbss            mCurrentMtxCalc__8J3DJoint */
 J3DMtxCalc* J3DJoint::mCurrentMtxCalc;

-/* 8032F3F8-8032F5A8 329D38 01B0+00 0/0 1/1 0/0 .text            recursiveCalc__8J3DJointFv */
 void J3DJoint::recursiveCalc() {
    J3DMtxCalc* prevMtxCalc = NULL;
    Mtx prevCurrentMtx;
@@ -14,7 +14,6 @@ enum {
    kTypeShape      = 0x12,
 };

-/* 80325A18-80325A9C 320358 0084+00 0/0 1/1 0/0 .text            __ct__12J3DJointTreeFv */
 J3DJointTree::J3DJointTree()
    : mHierarchy(NULL), mFlags(0), mModelDataType(0), mRootNode(NULL), mBasicMtxCalc(NULL),
      mJointNodePointer(NULL), mJointNum(0), mWEvlpMtxNum(0), mWEvlpMixMtxNum(0),
@@ -72,7 +71,6 @@ void J3DJointTree::makeHierarchy(J3DJoint* pJoint, const J3DModelHierarchy** pHi
    }
 }

-/* 80325C00-80325CAC 320540 00AC+00 0/0 2/2 0/0 .text findImportantMtxIndex__12J3DJointTreeFv */
 void J3DJointTree::findImportantMtxIndex() {
    s32 wEvlpMtxNum = getWEvlpMtxNum();
    u32 tableIdx = 0;
@@ -102,8 +100,6 @@ void J3DJointTree::findImportantMtxIndex() {
    }
 }

-/* 80325CAC-80325D1C 3205EC 0070+00 1/0 0/0 0/0 .text
- * calc__12J3DJointTreeFP12J3DMtxBufferRC3VecRA3_A4_Cf          */
 void J3DJointTree::calc(J3DMtxBuffer* pMtxBuffer, Vec const& scale, f32 const (&mtx)[3][4]) {
    J3D_ASSERT_NULLPTR(217, pMtxBuffer != NULL);
    getBasicMtxCalc()->init(scale, mtx);
@@ -117,8 +113,6 @@ void J3DJointTree::calc(J3DMtxBuffer* pMtxBuffer, Vec const& scale, f32 const (&
    root->recursiveCalc();
 }

-/* 80325D1C-80325D24 32065C 0008+00 1/1 0/0 0/0 .text setMtxBuffer__10J3DMtxCalcFP12J3DMtxBuffer
- */
 void J3DMtxCalc::setMtxBuffer(J3DMtxBuffer* mtxBuffer) {
    J3DMtxCalc::mMtxBuffer = mtxBuffer;
 }
@@ -5,7 +5,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/JUtility/JUTAssert.h"

-/* 8032F5A8-8032F5D0 329EE8 0028+00 0/0 1/1 0/0 .text            clear__16J3DMaterialTableFv */
 void J3DMaterialTable::clear() {
    mMaterialNum = 0;
    mUniqueMatNum = 0;
@@ -17,7 +16,6 @@ void J3DMaterialTable::clear() {
    field_0x1c = 0;
 }

-/* 8032F5D0-8032F604 329F10 0034+00 0/0 2/2 0/0 .text            __ct__16J3DMaterialTableFv */
 J3DMaterialTable::J3DMaterialTable() {
    mMaterialNum = 0;
    mUniqueMatNum = 0;
@@ -29,11 +27,8 @@ J3DMaterialTable::J3DMaterialTable() {
    field_0x1c = 0;
 }

-/* 8032F604-8032F64C 329F44 0048+00 1/0 1/1 0/0 .text            __dt__16J3DMaterialTableFv */
 J3DMaterialTable::~J3DMaterialTable() {}

-/* 8032F64C-8032F6F8 329F8C 00AC+00 0/0 1/1 5/5 .text
- * removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor    */
 int J3DMaterialTable::removeMatColorAnimator(J3DAnmColor* pAnmColor) {
    J3D_ASSERT_NULLPTR(208, pAnmColor != NULL);
    int ret = false;
@@ -54,8 +49,6 @@ int J3DMaterialTable::removeMatColorAnimator(J3DAnmColor* pAnmColor) {
    return ret;
 }

-/* 8032F6F8-8032F7B4 32A038 00BC+00 0/0 5/5 10/10 .text
- * removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern  */
 int J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern* pAnmTexPattern) {
    J3D_ASSERT_NULLPTR(242, pAnmTexPattern != NULL);
    int ret = 0;
@@ -78,8 +71,6 @@ int J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern* pAnmTexPattern) {
    return ret;
 }

-/* 8032F7B4-8032F880 32A0F4 00CC+00 0/0 4/4 26/26 .text
- * removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */
 int J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey* pAnmTexSRTKey) {
    J3D_ASSERT_NULLPTR(278, pAnmTexSRTKey != NULL);
    s32 ret = 0;
@@ -105,8 +96,6 @@ int J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey* pAnmTexSRTKey) {
    return ret;
 }

-/* 8032F880-8032F9C0 32A1C0 0140+00 0/0 7/7 24/24 .text
- * removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey  */
 int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey* pAnmTevRegKey) {
    J3D_ASSERT_NULLPTR(320, pAnmTevRegKey != NULL);
    s32 ret = 0;
@@ -144,8 +133,6 @@ int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey* pAnmTevRegKey) {
    return ret;
 }

-/* 8032F9C0-8032FAF4 32A300 0134+00 1/1 0/0 0/0 .text
- * createTexMtxForAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */
 int J3DMaterialTable::createTexMtxForAnimator(J3DAnmTextureSRTKey* pTexSRTKey) {
    J3D_ASSERT_NULLPTR(382, pTexSRTKey != NULL);
    int rv = 0;
@@ -178,8 +165,6 @@ int J3DMaterialTable::createTexMtxForAnimator(J3DAnmTextureSRTKey* pTexSRTKey) {
    return rv;
 }

-/* 8032FAF4-8032FBC8 32A434 00D4+00 0/0 1/1 0/0 .text
- * entryMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor     */
 int J3DMaterialTable::entryMatColorAnimator(J3DAnmColor* pAnmColor) {
    J3D_ASSERT_NULLPTR(450, pAnmColor != NULL);
    int rv = 0;
@@ -205,8 +190,6 @@ int J3DMaterialTable::entryMatColorAnimator(J3DAnmColor* pAnmColor) {
    return rv;
 }

-/* 8032FBC8-8032FCC4 32A508 00FC+00 0/0 7/7 1/1 .text
- * entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern   */
 int J3DMaterialTable::entryTexNoAnimator(J3DAnmTexPattern* pAnmTexPattern) {
    J3D_ASSERT_NULLPTR(489, pAnmTexPattern != NULL);
    int rv = 0;
@@ -234,8 +217,6 @@ int J3DMaterialTable::entryTexNoAnimator(J3DAnmTexPattern* pAnmTexPattern) {
    return rv;
 }

-/* 8032FCC4-8032FE70 32A604 01AC+00 0/0 14/14 6/6 .text
- * entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */
 int J3DMaterialTable::entryTexMtxAnimator(J3DAnmTextureSRTKey* pAnmTexSRTKey) {
    J3D_ASSERT_NULLPTR(532, pAnmTexSRTKey != NULL);
    int rv = 0;
@@ -278,8 +259,6 @@ int J3DMaterialTable::entryTexMtxAnimator(J3DAnmTextureSRTKey* pAnmTexSRTKey) {
    return rv;
 }

-/* 8032FE70-8032FFEC 32A7B0 017C+00 0/0 10/10 4/4 .text
- * entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey   */
 int J3DMaterialTable::entryTevRegAnimator(J3DAnmTevRegKey* pAnmTevRegKey) {
    J3D_ASSERT_NULLPTR(599, pAnmTevRegKey != NULL);
    int rv = 0;
@@ -8,7 +8,6 @@
 #define J3D_ASSERTMSG(LINE, COND, MSG) JUT_ASSERT_MSG(LINE, (COND) != 0, MSG)
 #define J3D_WARN1(LINE, MSG, ARG1) JUT_WARN(LINE, MSG, ARG1)

-/* 80327100-80327184 321A40 0084+00 0/0 3/3 0/0 .text            initialize__8J3DModelFv */
 void J3DModel::initialize() {
    mModelData = NULL;
    mFlags = 0;
@@ -33,8 +32,6 @@ void J3DModel::initialize() {
    mUnkCalc2 = NULL;
 }

-/* 80327184-80327300 321AC4 017C+00 0/0 3/3 0/0 .text
- * entryModelData__8J3DModelFP12J3DModelDataUlUl                */
 s32 J3DModel::entryModelData(J3DModelData* pModelData, u32 mdlFlags, u32 mtxNum) {
    J3D_ASSERTMSG(83, pModelData != NULL, "Error : null pointer.");
    J3D_ASSERTMSG(84, mtxNum != 0, "Error : non-zero argument is specified 0.");
@@ -95,8 +92,6 @@ s32 J3DModel::entryModelData(J3DModelData* pModelData, u32 mdlFlags, u32 mtxNum)
    return kJ3DError_Success;
 }

-/* 80327300-803273CC 321C40 00CC+00 1/1 0/0 0/0 .text createShapePacket__8J3DModelFP12J3DModelData
- */
 s32 J3DModel::createShapePacket(J3DModelData* pModelData) {
    J3D_ASSERTMSG(173, pModelData != NULL, "Error : null pointer.");

@@ -116,8 +111,6 @@ s32 J3DModel::createShapePacket(J3DModelData* pModelData) {
    return kJ3DError_Success;
 }

-/* 803273CC-803275FC 321D0C 0230+00 1/1 0/0 0/0 .text createMatPacket__8J3DModelFP12J3DModelDataUl
- */
 s32 J3DModel::createMatPacket(J3DModelData* pModelData, u32 mdlFlags) {
    J3D_ASSERTMSG(207, pModelData != NULL, "Error : null pointer.");
    s32 ret = 0;
@@ -200,7 +193,6 @@ s32 J3DModel::createMatPacket(J3DModelData* pModelData, u32 mdlFlags) {
    return kJ3DError_Success;
 }

-/* 803275FC-8032767C 321F3C 0080+00 0/0 1/1 0/0 .text newDifferedDisplayList__8J3DModelFUl */
 s32 J3DModel::newDifferedDisplayList(u32 diffFlags) {
    mDiffFlag = diffFlags;

@@ -232,7 +224,6 @@ void J3DModel::ptrToIndex() {
    }
 }

-/* 8032767C-803276B4 321FBC 0038+00 0/0 4/4 0/0 .text            lock__8J3DModelFv */
 void J3DModel::lock() {
    int matNum = mModelData->getMaterialNum();
    for (int i = 0; i < matNum; i++) {
@@ -240,7 +231,6 @@ void J3DModel::lock() {
    }
 }

-/* 803276B4-803276EC 321FF4 0038+00 0/0 2/2 0/0 .text            unlock__8J3DModelFv */
 void J3DModel::unlock() {
    int matNum = mModelData->getMaterialNum();
    for (int i = 0; i < matNum; i++) {
@@ -259,7 +249,6 @@ void J3DModel::makeDL() {
    }
 }

-/* 803276EC-80327858 32202C 016C+00 1/0 0/0 0/0 .text            calcMaterial__8J3DModelFv */
 void J3DModel::calcMaterial() {
    j3dSys.setModel(this);

@@ -291,7 +280,6 @@ void J3DModel::calcMaterial() {
    }
 }

-/* 80327858-803279A0 322198 0148+00 1/0 0/0 0/0 .text            calcDiffTexMtx__8J3DModelFv */
 void J3DModel::calcDiffTexMtx() {
    j3dSys.setModel(this);

@@ -317,7 +305,6 @@ void J3DModel::calcDiffTexMtx() {
    }
 }

-/* 803279A0-80327A2C 3222E0 008C+00 0/0 2/2 0/0 .text            diff__8J3DModelFv */
 void J3DModel::diff() {
    u16 matNum = mModelData->getMaterialNum();
    for (u16 i = 0; i < matNum; i++) {
@@ -326,8 +313,6 @@ void J3DModel::diff() {
    }
 }

-/* 80327A2C-80327AA0 32236C 0074+00 0/0 1/1 2/2 .text setDeformData__8J3DModelFP13J3DDeformDataUl
- */
 s32 J3DModel::setDeformData(J3DDeformData* p_deformData, u32 param_1) {
    mDeformData = p_deformData;

@@ -347,8 +332,6 @@ s32 J3DModel::setDeformData(J3DDeformData* p_deformData, u32 param_1) {
    return kJ3DError_Success;
 }

-/* 80327AA0-80327BD4 3223E0 0134+00 0/0 0/0 2/2 .text setSkinDeform__8J3DModelFP13J3DSkinDeformUl
- */
 s32 J3DModel::setSkinDeform(J3DSkinDeform* p_skinDeform, u32 flags) {
    mSkinDeform = p_skinDeform;

@@ -394,7 +377,6 @@ s32 J3DModel::setSkinDeform(J3DSkinDeform* p_skinDeform, u32 flags) {
    return ret;
 }

-/* 80327BD4-80327C58 322514 0084+00 1/1 0/0 2/2 .text            calcAnmMtx__8J3DModelFv */
 void J3DModel::calcAnmMtx() {
    j3dSys.setModel(this);

@@ -405,8 +387,6 @@ void J3DModel::calcAnmMtx() {
    }
 }

-/* 80327C58-80327CA4 322598 004C+00 1/1 1/1 1/1 .text            calcWeightEnvelopeMtx__8J3DModelFv
- */
 void J3DModel::calcWeightEnvelopeMtx() {
    if (getModelData()->getWEvlpMtxNum() != 0 && !checkFlag(J3DMdlFlag_EnableLOD)) {
        if (!getModelData()->checkFlag(0x100)) {
@@ -415,13 +395,11 @@ void J3DModel::calcWeightEnvelopeMtx() {
    }
 }

-/* 80327CA4-80327CF0 3225E4 004C+00 1/0 0/0 0/0 .text            update__8J3DModelFv */
 void J3DModel::update() {
    calc();
    entry();
 }

-/* 80327CF0-80327E4C 322630 015C+00 1/0 0/0 0/0 .text            calc__8J3DModelFv */
 void J3DModel::calc() {
    j3dSys.setModel(this);

@@ -468,7 +446,6 @@ void J3DModel::calc() {
    }
 }

-/* 80327E4C-80327F40 32278C 00F4+00 1/0 0/0 0/0 .text            entry__8J3DModelFv */
 void J3DModel::entry() {
    j3dSys.setModel(this);

@@ -495,7 +472,6 @@ void J3DModel::entry() {
    }
 }

-/* 80327F40-80328190 322880 0250+00 1/0 0/0 0/0 .text            viewCalc__8J3DModelFv */
 void J3DModel::viewCalc() {
    mMtxBuffer->swapDrawMtx();
    mMtxBuffer->swapNrmMtx();
@@ -532,12 +508,10 @@ void J3DModel::viewCalc() {
    prepareShapePackets();
 }

-/* 80328190-803281B4 322AD0 0024+00 1/1 0/0 0/0 .text            calcNrmMtx__8J3DModelFv */
 void J3DModel::calcNrmMtx() {
    mMtxBuffer->calcNrmMtx();
 }

-/* 803281B4-803282B8 322AF4 0104+00 1/1 0/0 0/0 .text            calcBumpMtx__8J3DModelFv */
 void J3DModel::calcBumpMtx() {
    if (getModelData()->checkBumpFlag()) {
        u32 bumpMtxIdx = 0;
@@ -555,14 +529,12 @@ void J3DModel::calcBumpMtx() {
    }
 }

-/* 803282B8-803282EC 322BF8 0034+00 1/1 0/0 0/0 .text            calcBBoardMtx__8J3DModelFv */
 void J3DModel::calcBBoardMtx() {
    if (getModelData()->checkBBoardFlag()) {
        mMtxBuffer->calcBBoardMtx();
    }
 }

-/* 803282EC-80328350 322C2C 0064+00 2/2 0/0 0/0 .text            prepareShapePackets__8J3DModelFv */
 void J3DModel::prepareShapePackets() {
    u16 shapeNum = mModelData->getShapeNum();

@@ -9,7 +9,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"

-/* 80325D88-80325DA0 3206C8 0018+00 1/1 2/2 0/0 .text            clear__12J3DModelDataFv */
 void J3DModelData::clear() {
    mpRawData = 0;
    mFlags = 0;
@@ -17,12 +16,10 @@ void J3DModelData::clear() {
    mbHasBillboard = 0;
 }

-/* 80325DA0-80325E14 3206E0 0074+00 0/0 2/2 0/0 .text            __ct__12J3DModelDataFv */
 J3DModelData::J3DModelData() {
    clear();
 }

-/* 80325E14-80325EC8 320754 00B4+00 0/0 2/2 0/0 .text newSharedDisplayList__12J3DModelDataFUl */
 s32 J3DModelData::newSharedDisplayList(u32 mdlFlags) {
    u16 matNum = getMaterialNum();

@@ -42,7 +39,6 @@ s32 J3DModelData::newSharedDisplayList(u32 mdlFlags) {
    return kJ3DError_Success;
 }

-/* 80325EC8-80325F94 320808 00CC+00 0/0 1/1 0/0 .text            indexToPtr__12J3DModelDataFv */
 void J3DModelData::indexToPtr() {
    j3dSys.setTexture(getTexture());

@@ -65,7 +61,6 @@ void J3DModelData::indexToPtr() {
    OSRestoreInterrupts(sInterruptFlag);
 }

-/* 80325F94-8032600C 3208D4 0078+00 0/0 2/2 0/0 .text            makeSharedDL__12J3DModelDataFv */
 void J3DModelData::makeSharedDL() {
    j3dSys.setTexture(getTexture());

@@ -75,8 +70,6 @@ void J3DModelData::makeSharedDL() {
    }
 }

-/* 8032600C-803260CC 32094C 00C0+00 0/0 3/3 7/7 .text simpleCalcMaterial__12J3DModelDataFUsPA4_f
- */
 void J3DModelData::simpleCalcMaterial(u16 idx, Mtx param_1) {
    syncJ3DSysFlags();

@@ -90,7 +83,6 @@ void J3DModelData::simpleCalcMaterial(u16 idx, Mtx param_1) {
    }
 }

-/* 803260CC-803260F8 320A0C 002C+00 0/0 1/1 0/0 .text syncJ3DSysPointers__12J3DModelDataCFv */
 void J3DModelData::syncJ3DSysPointers() const {
    j3dSys.setTexture(getTexture());
    j3dSys.setVtxPos(getVtxPosArray());
@@ -98,8 +90,6 @@ void J3DModelData::syncJ3DSysPointers() const {
    j3dSys.setVtxCol(getVtxColorArray(0));
 }

-/* 803260F8-80326134 320A38 003C+00 1/1 5/5 0/0 .text            syncJ3DSysFlags__12J3DModelDataCFv
- */
 void J3DModelData::syncJ3DSysFlags() const {
    if (checkFlag(0x20)) {
        j3dSys.onFlag(J3DSysFlag_PostTexMtx);
@@ -5,16 +5,12 @@
 #include "JSystem/J3DGraphLoader/J3DModelLoader.h"
 #include "JSystem/JKernel/JKRHeap.h"

-/* 804371C0-804371F0 063EE0 0030+00 1/0 0/0 0/0 .bss             sNoUseDrawMtx__12J3DMtxBuffer */
 Mtx J3DMtxBuffer::sNoUseDrawMtx;

-/* 804371F0-80437218 063F10 0024+04 1/0 0/0 0/0 .bss             sNoUseNrmMtx__12J3DMtxBuffer */
 Mtx33 J3DMtxBuffer::sNoUseNrmMtx;

-/* 80450970-80450974 -00001 0004+00 1/1 0/0 0/0 .sdata           sNoUseDrawMtxPtr__12J3DMtxBuffer */
 Mtx* J3DMtxBuffer::sNoUseDrawMtxPtr = &J3DMtxBuffer::sNoUseDrawMtx;

-/* 80450974-80450978 -00001 0004+00 1/1 0/0 0/0 .sdata           sNoUseNrmMtxPtr__12J3DMtxBuffer */
 Mtx33* J3DMtxBuffer::sNoUseNrmMtxPtr = &J3DMtxBuffer::sNoUseNrmMtx;

 // force .sdata2 order
@@ -26,7 +22,6 @@ f32 dummy0() {
    return 0.0f;
 }

-/* 80326214-80326258 320B54 0044+00 0/0 1/1 0/0 .text            initialize__12J3DMtxBufferFv */
 void J3DMtxBuffer::initialize() {
    mJointTree = NULL;
    mpScaleFlagArr = NULL;
@@ -44,7 +39,6 @@ void J3DMtxBuffer::initialize() {
    mpUserAnmMtx = NULL;
 }

-/* 80326258-80326364 320B98 010C+00 0/0 1/1 0/0 .text create__12J3DMtxBufferFP12J3DModelDataUl */
 enum {
    J3DMdlDataFlag_ConcatView = 0x10,
    J3DMdlDataFlag_NoAnimation = 0x100,
@@ -96,8 +90,6 @@ s32 J3DMtxBuffer::create(J3DModelData* pModelData, u32 mtxNum) {
    return ret;
 }

-/* 80326364-803263F0 320CA4 008C+00 1/1 0/0 0/0 .text createAnmMtx__12J3DMtxBufferFP12J3DModelData
- */
 J3DError J3DMtxBuffer::createAnmMtx(J3DModelData* pModelData) {
    if (pModelData->getJointNum() != 0) {
        mpScaleFlagArr = new u8[pModelData->getJointNum()];
@@ -115,8 +107,6 @@ J3DError J3DMtxBuffer::createAnmMtx(J3DModelData* pModelData) {
    return kJ3DError_Success;
 }

-/* 803263F0-8032648C 320D30 009C+00 1/1 0/0 0/0 .text
- * createWeightEnvelopeMtx__12J3DMtxBufferFP12J3DModelData      */
 s32 J3DMtxBuffer::createWeightEnvelopeMtx(J3DModelData* pModelData) {
    if (pModelData->getWEvlpMtxNum() != 0) {
        mpEvlpScaleFlagArr = new u8[pModelData->getWEvlpMtxNum()];
@@ -131,8 +121,6 @@ s32 J3DMtxBuffer::createWeightEnvelopeMtx(J3DModelData* pModelData) {
    return kJ3DError_Success;
 }

-/* 8032648C-803264B8 320DCC 002C+00 1/1 0/0 0/0 .text            setNoUseDrawMtx__12J3DMtxBufferFv
- */
 s32 J3DMtxBuffer::setNoUseDrawMtx() {
    mpDrawMtxArr[0] = mpDrawMtxArr[1] = &sNoUseDrawMtxPtr;
    mpNrmMtxArr[0] = mpNrmMtxArr[1] = &sNoUseNrmMtxPtr;
@@ -140,8 +128,6 @@ s32 J3DMtxBuffer::setNoUseDrawMtx() {
    return kJ3DError_Success;
 }

-/* 803264B8-80326664 320DF8 01AC+00 1/1 0/0 0/0 .text
- * createDoubleDrawMtx__12J3DMtxBufferFP12J3DModelDataUl        */
 s32 J3DMtxBuffer::createDoubleDrawMtx(J3DModelData* pModelData, u32 mtxNum) {
    if (mtxNum != 0) {
        for (s32 i = 0; i < 2; i++) {
@@ -183,8 +169,6 @@ s32 J3DMtxBuffer::createDoubleDrawMtx(J3DModelData* pModelData, u32 mtxNum) {
    return kJ3DError_Success;
 }

-/* 80326664-803268D4 320FA4 0270+00 1/1 0/0 0/0 .text
- * createBumpMtxArray__12J3DMtxBufferFP12J3DModelDataUl         */
 s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 mtxNum) {
    J3D_ASSERT_NULLPTR(295, i_modelData != NULL);

@@ -250,10 +234,8 @@ s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 mtxNum) {
    return kJ3DError_Success;
 }

-/* 80450978-80450980 0003F8 0008+00 1/1 0/0 0/0 .sdata           J3DUnit01 */
 static f32 J3DUnit01[] = { 0.0f, 1.0f };

-/* 803268D4-80326ACC 321214 01F8+00 0/0 1/1 0/0 .text calcWeightEnvelopeMtx__12J3DMtxBufferFv */
 void J3DMtxBuffer::calcWeightEnvelopeMtx() {
    register MtxP weightAnmMtx;
    register Mtx* worldMtx;
@@ -418,8 +400,6 @@ void J3DMtxBuffer::calcWeightEnvelopeMtx() {
    }
 }

-/* 80326ACC-80326D3C 32140C 0270+00 0/0 1/1 0/0 .text
- * calcDrawMtx__12J3DMtxBufferFUlRC3VecRA3_A4_Cf                */
 void J3DMtxBuffer::calcDrawMtx(u32 mdlFlag, Vec const& param_1, Mtx const& param_2) {
    Mtx* sp24, *sp20;
    int sp1C = 0;
@@ -469,7 +449,6 @@ void J3DMtxBuffer::calcDrawMtx(u32 mdlFlag, Vec const& param_1, Mtx const& param
    }
 }

-/* 80326D3C-80326EF0 32167C 01B4+00 0/0 1/1 0/0 .text            calcNrmMtx__12J3DMtxBufferFv */
 void J3DMtxBuffer::calcNrmMtx() {
    u16 drawMtxNum = mJointTree->getDrawMtxNum();
    for (u16 i = 0; i < drawMtxNum; i++) {
@@ -489,7 +468,6 @@ void J3DMtxBuffer::calcNrmMtx() {
    }
 }

-/* 80326EF0-80327048 321830 0158+00 0/0 1/1 0/0 .text            calcBBoardMtx__12J3DMtxBufferFv */
 void J3DMtxBuffer::calcBBoardMtx() {
    u16 drawMtxNum = mJointTree->getDrawMtxNum();
    for (u16 i = 0; i < drawMtxNum; i++) {
@@ -519,8 +497,6 @@ void J3DMtxBuffer::calcBBoardMtx() {
    }
 }

-/* 80327048-80327100 321988 00B8+00 1/1 1/1 0/0 .text
- * J3DCalcViewBaseMtx__FPA4_fRC3VecRA3_A4_CfPA4_f               */
 void J3DCalcViewBaseMtx(Mtx view, Vec const& scale, const Mtx& base, Mtx dst) {
    Mtx m;

@@ -5,7 +5,6 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include <string.h>

-/* 8032C6E4-8032C704 327024 0020+00 1/1 0/0 0/0 .text            __ct__12J3DSkinNListFv */
 J3DSkinNList::J3DSkinNList() {
    field_0x0 = NULL;
    field_0x4 = NULL;
@@ -15,7 +14,6 @@ J3DSkinNList::J3DSkinNList() {
    field_0x12 = 0;
 }

-/* 8032C704-8032C7BC 327044 00B8+00 1/1 0/0 0/0 .text J3DPSWeightMTXMultVec__FPA4_ffP3VecP3Vec */
 static void J3DPSWeightMTXMultVec(f32 (*param_0)[4], f32 param_1, Vec* param_2, Vec* param_3) {
    f32 f4 = param_0[0][3] + param_0[0][0] * param_2->x;
    f32 f5 = param_0[1][3] + param_0[1][0] * param_2->x;
@@ -31,8 +29,6 @@ static void J3DPSWeightMTXMultVec(f32 (*param_0)[4], f32 param_1, Vec* param_2,
    param_3->z += f3 * param_1;
 }

-/* 8032C7BC-8032C85C 3270FC 00A0+00 1/1 0/0 0/0 .text J3DPSWeightMTXMultVecSR__FPA4_ffP3VecP3Vec
- */
 static void J3DPSWeightMTXMultVecSR(f32 (*param_0)[4], f32 param_1, Vec* param_2,
                                    Vec* param_3) {
    f32 f4 = param_0[0][0] * param_2->x;
@@ -49,8 +45,6 @@ static void J3DPSWeightMTXMultVecSR(f32 (*param_0)[4], f32 param_1, Vec* param_2
    param_3->z += f3 * param_1;
 }

-/* 8032C85C-8032C8E4 32719C 0088+00 1/1 0/0 0/0 .text calcSkin_VtxPosF32__12J3DSkinNListFPA4_fPvPv
- */
 void J3DSkinNList::calcSkin_VtxPosF32(f32 (*param_0)[4], void* param_1, void* param_2) {
    int r29 = field_0x10;
    for (int i = 0; i < r29; i++) {
@@ -61,8 +55,6 @@ void J3DSkinNList::calcSkin_VtxPosF32(f32 (*param_0)[4], void* param_1, void* pa
    }
 }

-/* 8032C8E4-8032C96C 327224 0088+00 1/1 0/0 0/0 .text calcSkin_VtxNrmF32__12J3DSkinNListFPA4_fPvPv
- */
 void J3DSkinNList::calcSkin_VtxNrmF32(f32 (*param_0)[4], void* param_1, void* param_2) {
    int r29 = field_0x12;
    for (int i = 0; i < r29; i++) {
@@ -73,7 +65,6 @@ void J3DSkinNList::calcSkin_VtxNrmF32(f32 (*param_0)[4], void* param_1, void* pa
    }
 }

-/* 8032C96C-8032C9B0 3272AC 0044+00 0/0 0/0 2/2 .text            __ct__13J3DSkinDeformFv */
 J3DSkinDeform::J3DSkinDeform() {
    mPosData = NULL;
    mNrmData = NULL;
@@ -87,14 +78,10 @@ J3DSkinDeform::J3DSkinDeform() {
    mSkinNList = NULL;
 }

-/* 80437218-80438218 063F38 1000+00 1/1 0/0 0/0 .bss sWorkArea_WEvlpMixMtx__13J3DSkinDeform */
 u16* J3DSkinDeform::sWorkArea_WEvlpMixMtx[1024];

-/* 80438218-80439218 064F38 1000+00 1/1 0/0 0/0 .bss sWorkArea_WEvlpMixWeight__13J3DSkinDeform */
 f32* J3DSkinDeform::sWorkArea_WEvlpMixWeight[1024];

-/* 8032C9B0-8032CF44 3272F0 0594+00 0/0 1/1 0/0 .text
- * initSkinInfo__13J3DSkinDeformFP12J3DModelData                */
 void J3DSkinDeform::initSkinInfo(J3DModelData* pModelData) {
    J3D_ASSERT_NULLPTR(322, pModelData != NULL);

@@ -206,12 +193,8 @@ void J3DSkinDeform::initSkinInfo(J3DModelData* pModelData) {
    }
 }

-/* 80439218-80439A20 065F38 0800+08 1/1 0/0 0/0 .bss             sWorkArea_MtxReg__13J3DSkinDeform
- */
 u16 J3DSkinDeform::sWorkArea_MtxReg[1024];

-/* 8032CF44-8032D378 327884 0434+00 0/0 1/1 0/0 .text
- * initMtxIndexArray__13J3DSkinDeformFP12J3DModelData           */
 int J3DSkinDeform::initMtxIndexArray(J3DModelData* pModelData) {
    J3D_ASSERT_NULLPTR(507, pModelData != NULL);
    if (mPosData != NULL && mNrmData != NULL) {
@@ -364,8 +347,6 @@ int J3DSkinDeform::initMtxIndexArray(J3DModelData* pModelData) {
    return kJ3DError_Success;
 }

-/* 8032D378-8032D5C4 327CB8 024C+00 0/0 1/1 0/0 .text
- * changeFastSkinDL__13J3DSkinDeformFP12J3DModelData            */
 // NONMATCHING - instruction ordering/optimization issue, matches debug
 // the compiler needs to delay adding +3 to dl until the end of the while loop for the function to match
 // but instead it puts the +3 at the start of the for loop and reworks the other instructions
@@ -439,8 +420,6 @@ void J3DSkinDeform::changeFastSkinDL(J3DModelData* pModelData) {
    }
 }

-/* 8032D5C4-8032D738 327F04 0174+00 1/1 0/0 0/0 .text calcNrmMtx__13J3DSkinDeformFP12J3DMtxBuffer
- */
 void J3DSkinDeform::calcNrmMtx(J3DMtxBuffer* pMtxBuffer) {
    J3DJointTree* jointTree = pMtxBuffer->getJointTree();
    u16 drawMtxNum = jointTree->getDrawMtxNum();
@@ -461,8 +440,6 @@ void J3DSkinDeform::calcNrmMtx(J3DMtxBuffer* pMtxBuffer) {
    }
 }

-/* 8032D738-8032D87C 328078 0144+00 0/0 1/1 0/0 .text
- * transformVtxPosNrm__13J3DSkinDeformFP12J3DModelData          */
 void J3DSkinDeform::transformVtxPosNrm(J3DModelData* pModelData) {
    if (pModelData->getWEvlpMtxNum() != 0 && field_0x19 == 0) {
        int vtmNum = pModelData->getVtxNum();
@@ -494,8 +471,6 @@ void J3DSkinDeform::transformVtxPosNrm(J3DModelData* pModelData) {
    }
 }

-/* 8032D87C-8032D8F4 3281BC 0078+00 1/1 0/0 0/0 .text
- * calcAnmInvJointMtx__13J3DSkinDeformFP12J3DMtxBuffer          */
 void J3DSkinDeform::calcAnmInvJointMtx(J3DMtxBuffer* pMtxBuffer) {
    J3D_ASSERT_NULLPTR(978, pMtxBuffer != NULL);

@@ -510,8 +485,6 @@ void J3DSkinDeform::calcAnmInvJointMtx(J3DMtxBuffer* pMtxBuffer) {
    }
 }

-/* 8032D8F4-8032DA1C 328234 0128+00 1/1 0/0 0/0 .text
- * deformFastVtxPos_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer */
 void J3DSkinDeform::deformFastVtxPos_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) const {
    pVtxBuffer->swapTransformedVtxPos();
    J3DJointTree* jointTree = pMtxBuffer->getJointTree();
@@ -540,8 +513,6 @@ void J3DSkinDeform::deformFastVtxPos_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuff
    pVtxBuffer->setCurrentVtxPos(transformedVtxPos);
 }

-/* 8032DA1C-8032DB50 32835C 0134+00 1/1 0/0 0/0 .text
- * deformFastVtxNrm_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer */
 void J3DSkinDeform::deformFastVtxNrm_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) const {
    pVtxBuffer->swapTransformedVtxNrm();
    J3DJointTree* jointTree = pMtxBuffer->getJointTree();
@@ -574,8 +545,6 @@ void J3DSkinDeform::deformFastVtxNrm_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuff
    pVtxBuffer->setCurrentVtxNrm(transformedVtxNrm);
 }

-/* 8032DB50-8032DC74 328490 0124+00 1/1 0/0 0/0 .text
- * deformVtxPos_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer */
 void J3DSkinDeform::deformVtxPos_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) const {
    Mtx* anmMtx = NULL;
    Mtx* anmMtxs[2];
@@ -598,8 +567,6 @@ void J3DSkinDeform::deformVtxPos_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer*
    pVtxBuffer->setCurrentVtxPos(transformedVtxPos);
 }

-/* 8032DC74-8032DDB8 3285B4 0144+00 1/1 0/0 0/0 .text
- * deformVtxPos_S16__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer */
 void J3DSkinDeform::deformVtxPos_S16(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) const {
    Mtx* anmMtx = NULL;
    Mtx* anmMtxs[2];
@@ -624,8 +591,6 @@ void J3DSkinDeform::deformVtxPos_S16(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer*
    pVtxBuffer->setCurrentVtxPos(transformedVtxPos);
 }

-/* 8032DDB8-8032DEBC 3286F8 0104+00 1/1 0/0 0/0 .text
- * deformVtxNrm_F32__13J3DSkinDeformCFP15J3DVertexBuffer        */
 void J3DSkinDeform::deformVtxNrm_F32(J3DVertexBuffer* pVtxBuffer) const {
    pVtxBuffer->swapTransformedVtxNrm();
    int nrmNum = pVtxBuffer->getVertexData()->getNrmNum();
@@ -640,8 +605,6 @@ void J3DSkinDeform::deformVtxNrm_F32(J3DVertexBuffer* pVtxBuffer) const {
    pVtxBuffer->setCurrentVtxNrm(transformedVtxNrm);
 }

-/* 8032DEBC-8032DFDC 3287FC 0120+00 1/1 0/0 0/0 .text
- * deformVtxNrm_S16__13J3DSkinDeformCFP15J3DVertexBuffer        */
 void J3DSkinDeform::deformVtxNrm_S16(J3DVertexBuffer* pVtxBuffer) const {
    int vtxNrmFrac = pVtxBuffer->getVertexData()->getVtxNrmFrac();
    J3DGQRSetup7(vtxNrmFrac, 7, vtxNrmFrac, 7);
@@ -659,8 +622,6 @@ void J3DSkinDeform::deformVtxNrm_S16(J3DVertexBuffer* pVtxBuffer) const {
    pVtxBuffer->setCurrentVtxNrm(transformedVtxNrm);
 }

-/* 8032DFDC-8032E064 32891C 0088+00 0/0 1/1 0/0 .text            deform__13J3DSkinDeformFP8J3DModel
- */
 void J3DSkinDeform::deform(J3DModel* pModel) {
    J3D_ASSERT_NULLPTR(1270, pModel != NULL);

@@ -679,8 +640,6 @@ void J3DSkinDeform::deform(J3DModel* pModel) {
    deform(pModel->getVertexBuffer(), pModel->getMtxBuffer());
 }

-/* 8032E064-8032E180 3289A4 011C+00 1/0 0/0 0/0 .text
- * deform__13J3DSkinDeformFP15J3DVertexBufferP12J3DMtxBuffer    */
 void J3DSkinDeform::deform(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) {
    J3D_ASSERT_NULLPTR(1299, pVtxBuffer != NULL);
    J3D_ASSERT_NULLPTR(1300, pMtxBuffer != NULL);
@@ -715,12 +674,9 @@ void J3DSkinDeform::deform(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer
    }
 }

-/* 8032E180-8032E1B0 328AC0 0030+00 0/0 1/1 0/0 .text            calc__15J3DVtxColorCalcFP8J3DModel
- */
 void J3DVtxColorCalc::calc(J3DModel* pModel) {
    J3D_ASSERT_NULLPTR(1351, pModel != NULL);
    calc(pModel->getVertexBuffer());
 }

-/* 8032E1B0-8032E1F8 328AF0 0048+00 1/0 0/0 0/0 .text            __dt__13J3DSkinDeformFv */
 J3DSkinDeform::~J3DSkinDeform() {}