moved strings + decompile simple store functions

8 files changed, 230 insertions, 210 deletions

diff --git a/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
index c707f266d6..7f1cbb4bd0 100644
--- a/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
+++ b/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
@@ -79,15 +79,15 @@ struct J3DAnmLoader {
     /* 80339800 */ ~J3DAnmLoader();
 };
 
-struct J3DAnmColorKeyData {};
-
-struct J3DAnmClusterKeyData {};
+struct J3DAnmClusterKey {};
 
 struct J3DAnmColorKey {
     /* 8032AB00 */ J3DAnmColorKey();
 };
 
-struct J3DAnmClusterKey {};
+struct J3DAnmColorKeyData {};
+
+struct J3DAnmClusterKeyData {};
 
 struct J3DAnmKeyLoader_v15 {
     /* 803384E0 */ J3DAnmKeyLoader_v15();
@@ -108,15 +108,15 @@ struct J3DAnmKeyLoader_v15 {
     /* 80339634 */ void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
 };
 
-struct J3DAnmColorFullData {};
+struct J3DAnmClusterFullData {};
+
+struct J3DAnmClusterFull {};
 
 struct J3DAnmColorFull {
     /* 8032A93C */ J3DAnmColorFull();
 };
 
-struct J3DAnmClusterFullData {};
-
-struct J3DAnmClusterFull {};
+struct J3DAnmColorFullData {};
 
 struct J3DAnmFullLoader_v15 {
     /* 80338468 */ J3DAnmFullLoader_v15();
@@ -186,8 +186,8 @@ setAnmVtxColor__19J3DAnmKeyLoader_v15FP17J3DAnmVtxColorKeyPC21J3DAnmVtxColorKeyD
 extern "C" void __dt__20J3DAnmVisibilityFullFv();
 extern "C" s32 getKind__20J3DAnmVisibilityFullCFv();
 extern "C" void __dt__12J3DAnmLoaderFv();
-extern "C" void func_80339848(void const*, void const*);
-extern "C" void func_80339860(void const*, void const*);
+extern "C" void func_80339848(void* _this, void const*, void const*);
+extern "C" void func_80339860(void* _this, void const*, void const*);
 extern "C" extern char const* const J3DAnmLoader__stringBase0;
 
 //
@@ -198,21 +198,21 @@ extern "C" void OSReport();
 extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
 extern "C" void setResource__10JUTNameTabFPC7ResNTAB();
-extern "C" void func_802F4260(void const*, void const*);
-extern "C" void func_802F42C0(void const*, void const*);
-extern "C" void func_8030A458(void const*, void const*);
-extern "C" void func_8030A470(void const*, void const*);
-extern "C" void func_8030A488(void const*, void const*);
-extern "C" void func_8030A4A0(void const*, void const*);
-extern "C" void func_8030A4B8(void const*, void const*);
-extern "C" void func_8030A4D0(void const*, void const*);
-extern "C" void func_8030A4E8(void const*, void const*);
-extern "C" void func_8030A500(void const*, void const*);
-extern "C" void func_8030A518(void const*, void const*);
-extern "C" void func_8030A530(void const*, void const*);
-extern "C" void func_8030A548(void const*, void const*);
-extern "C" void func_8030A560(void const*, void const*);
-extern "C" void func_8030A578(void const*, void const*);
+extern "C" void func_802F4260(void* _this, void const*, void const*);
+extern "C" void func_802F42C0(void* _this, void const*, void const*);
+extern "C" void func_8030A458(void* _this, void const*, void const*);
+extern "C" void func_8030A470(void* _this, void const*, void const*);
+extern "C" void func_8030A488(void* _this, void const*, void const*);
+extern "C" void func_8030A4A0(void* _this, void const*, void const*);
+extern "C" void func_8030A4B8(void* _this, void const*, void const*);
+extern "C" void func_8030A4D0(void* _this, void const*, void const*);
+extern "C" void func_8030A4E8(void* _this, void const*, void const*);
+extern "C" void func_8030A500(void* _this, void const*, void const*);
+extern "C" void func_8030A518(void* _this, void const*, void const*);
+extern "C" void func_8030A530(void* _this, void const*, void const*);
+extern "C" void func_8030A548(void* _this, void const*, void const*);
+extern "C" void func_8030A560(void* _this, void const*, void const*);
+extern "C" void func_8030A578(void* _this, void const*, void const*);
 extern "C" void __ct__15J3DAnmTransformFsPfPsPf();
 extern "C" void __ct__19J3DAnmTextureSRTKeyFv();
 extern "C" void __ct__18J3DAnmVtxColorFullFv();
@@ -240,6 +240,13 @@ extern "C" extern void* __vt__19J3DAnmTransformFull[5 + 1 /* padding */];
 //
 
 /* ############################################################################################## */
+/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_803A2130 =
+    "J3DAnmLoader: this is not a J3D Binary.\n";
+#pragma pop
+
 /* 803CF238-803CF24C 02C358 0014+00 2/2 0/0 0/0 .data            __vt__19J3DAnmKeyLoader_v15 */
 SECTION_DATA extern void* __vt__19J3DAnmKeyLoader_v15[5] = {
     (void*)NULL /* RTTI */,
@@ -342,6 +349,15 @@ asm J3DAnmKeyLoader_v15::~J3DAnmKeyLoader_v15() {
 }
 #pragma pop
 
+/* ############################################################################################## */
+/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_803A2159 = "Unknown data block\n";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_803A216D = "\0\0";
+#pragma pop
+
 /* 80338558-803386A0 332E98 0148+00 2/1 0/0 0/0 .text            load__20J3DAnmFullLoader_v15FPCv */
 #pragma push
 #pragma optimization_level 0
@@ -691,7 +707,7 @@ asm J3DAnmLoader::~J3DAnmLoader() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80339848(void const* param_0, void const* param_1) {
+extern "C" asm void func_80339848(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DAnmLoader/func_80339848.s"
 }
@@ -702,19 +718,10 @@ extern "C" asm void func_80339848(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80339860(void const* param_0, void const* param_1) {
+extern "C" asm void func_80339860(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DAnmLoader/func_80339860.s"
 }
 #pragma pop
 
-/* 803A2130-803A2170 02E790 003D+03 6/6 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_803A2130 =
-    "J3DAnmLoader: this is not a J3D Binary.\n";
-SECTION_DEAD static char const* const stringBase_803A2159 = "Unknown data block\n";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_803A216D = "\0\0";
-#pragma pop
+/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
index 7efebd1409..b0d7bb9be2 100644
--- a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
+++ b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
@@ -52,9 +52,9 @@ extern "C" void __dt__20J3DClusterLoader_v15Fv();
 extern "C" void load__20J3DClusterLoader_v15FPCv();
 extern "C" void readCluster__20J3DClusterLoader_v15FPC15J3DClusterBlock();
 extern "C" void __dt__16J3DClusterLoaderFv();
-extern "C" void func_80334644(void const*, void const*);
-extern "C" void func_8033465C(void const*, void const*);
-extern "C" void func_80334674(void const*, void const*);
+extern "C" void func_80334644(void* _this, void const*, void const*);
+extern "C" void func_8033465C(void* _this, void const*, void const*);
+extern "C" void func_80334674(void* _this, void const*, void const*);
 extern "C" extern char const* const J3DClusterLoader__stringBase0;
 
 //
@@ -68,9 +68,9 @@ extern "C" void* __nwa__FUl();
 extern "C" void* __nwa__FUli();
 extern "C" void __dl__FPv();
 extern "C" void __ct__10JUTNameTabFPC7ResNTAB();
-extern "C" void func_802F42C0(void const*, void const*);
-extern "C" void func_8030A530(void const*, void const*);
-extern "C" void func_8030A560(void const*, void const*);
+extern "C" void func_802F42C0(void* _this, void const*, void const*);
+extern "C" void func_8030A530(void* _this, void const*, void const*);
+extern "C" void func_8030A560(void* _this, void const*, void const*);
 extern "C" void __ct__13J3DDeformDataFv();
 extern "C" void __ct__11J3DDeformerFP13J3DDeformData();
 extern "C" void DCStoreRange();
@@ -130,6 +130,15 @@ asm J3DClusterLoader_v15::~J3DClusterLoader_v15() {
 }
 #pragma pop
 
+/* ############################################################################################## */
+/* 803A2098-803A2098 02E6F8 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_803A2098 = "Unknown data block\n";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_803A20AC = "\0\0\0";
+#pragma pop
+
 /* 80334244-803342F8 32EB84 00B4+00 2/1 0/0 0/0 .text            load__20J3DClusterLoader_v15FPCv */
 #pragma push
 #pragma optimization_level 0
@@ -166,7 +175,7 @@ asm J3DClusterLoader::~J3DClusterLoader() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80334644(void const* param_0, void const* param_1) {
+extern "C" asm void func_80334644(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DClusterLoader/func_80334644.s"
 }
@@ -177,7 +186,7 @@ extern "C" asm void func_80334644(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_8033465C(void const* param_0, void const* param_1) {
+extern "C" asm void func_8033465C(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DClusterLoader/func_8033465C.s"
 }
@@ -188,17 +197,10 @@ extern "C" asm void func_8033465C(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80334674(void const* param_0, void const* param_1) {
+extern "C" asm void func_80334674(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DClusterLoader/func_80334674.s"
 }
 #pragma pop
 
-/* 803A2098-803A20B0 02E6F8 0014+04 1/1 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_803A2098 = "Unknown data block\n";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_803A20AC = "\0\0\0";
-#pragma pop
+/* 803A2098-803A2098 02E6F8 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp
index c2dc851fde..5960abff0d 100644
--- a/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp
+++ b/libs/JSystem/J3DGraphLoader/J3DJointFactory.cpp
@@ -28,7 +28,7 @@ struct J3DJoint {
 
 extern "C" void __ct__15J3DJointFactoryFRC13J3DJointBlock();
 extern "C" void create__15J3DJointFactoryFi();
-extern "C" void func_80337338(void const*, u32);
+extern "C" void func_80337338(void* _this, void const*, u32);
 
 //
 // External References:
@@ -36,7 +36,7 @@ extern "C" void func_80337338(void const*, u32);
 
 extern "C" void* __nw__FUl();
 extern "C" void __ct__8J3DJointFv();
-extern "C" void func_8033677C(void const*, u32);
+extern "C" void func_8033677C(void* _this, void const*, u32);
 
 //
 // Declarations:
@@ -67,7 +67,7 @@ asm void J3DJointFactory::create(int param_0) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80337338(void const* param_0, u32 param_1) {
+extern "C" asm void func_80337338(void* _this, void const* param_0, u32 param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DJointFactory/func_80337338.s"
 }
diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
index 5459112a69..38a042e239 100644
--- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
+++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
@@ -37,12 +37,12 @@ struct J3DTexGenBlockNull {
     /* 80332AD0 */ ~J3DTexGenBlockNull();
 };
 
+struct J3DNBTScale {};
+
 struct J3DTexCoord {
     /* 8000E464 */ J3DTexCoord();
 };
 
-struct J3DNBTScale {};
-
 struct J3DTexGenBlock {
     /* 8000DFD8 */ bool getTexMtx(u32);
     /* 8000DFE0 */ bool getTexCoord(u32);
@@ -83,14 +83,14 @@ struct J3DGXColorS10 {
     /* 8000E460 */ J3DGXColorS10();
 };
 
-struct J3DGXColor {
-    /* 8000E538 */ J3DGXColor();
-};
-
 struct J3DIndTevStage {
     /* 8000E14C */ J3DIndTevStage();
 };
 
+struct J3DGXColor {
+    /* 8000E538 */ J3DGXColor();
+};
+
 struct J3DTevBlock {
     /* 8000DBC8 */ void patchTexNoAndTexCoordScale();
     /* 8000DBD4 */ void patch();
@@ -133,7 +133,6 @@ struct J3DTevBlock {
     /* 80321940 */ void diffTevStage();
     /* 80321944 */ void diffTexCoordScale();
     /* 80321948 */ void diffTexNo();
-    /* 80321FE0 */ void setTexNoOffset(u32);
     /* 80322958 */ void setTevSwapModeInfo(u32, J3DTevSwapModeInfo);
     /* 8032295C */ void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*);
     /* 80322964 */ bool getTevRegOffset() const;
@@ -162,12 +161,12 @@ struct J3DPEBlockNull {
     /* 803329B0 */ ~J3DPEBlockNull();
 };
 
-struct J3DBlend {};
-
 struct J3DFog {};
 
 struct J3DAlphaComp {};
 
+struct J3DBlend {};
+
 struct J3DPEBlock {
     /* 8000DBCC */ void patch();
     /* 8000DF3C */ bool getZCompLoc() const;
@@ -391,25 +390,25 @@ extern "C" void __dt__18J3DTexGenBlockNullFv();
 extern "C" void getType__17J3DColorBlockNullFv();
 extern "C" void __dt__17J3DColorBlockNullFv();
 extern "C" void __dt__11J3DMaterialFv();
-extern "C" void func_80332BDC(void const*, void const*);
-extern "C" void func_80332BF4(void const*, void const*);
-extern "C" void func_80332C0C(void const*, void const*);
-extern "C" void func_80332C24(void const*, void const*);
-extern "C" void func_80332C3C(void const*, void const*);
-extern "C" void func_80332C54(void const*, void const*);
-extern "C" void func_80332C6C(void const*, void const*);
-extern "C" void func_80332C84(void const*, void const*);
-extern "C" void func_80332C9C(void const*, void const*);
-extern "C" void func_80332CB4(void const*, void const*);
-extern "C" void func_80332CCC(void const*, void const*);
-extern "C" void func_80332CE4(void const*, void const*);
-extern "C" void func_80332CFC(void const*, void const*);
-extern "C" void func_80332D14(void const*, void const*);
-extern "C" void func_80332D2C(void const*, void const*);
-extern "C" void func_80332D44(void const*, void const*);
-extern "C" void func_80332D5C(void const*, void const*);
-extern "C" void func_80332D74(void const*, void const*);
-extern "C" void func_80332D8C(void const*, void const*);
+extern "C" void func_80332BDC(void* _this, void const*, void const*);
+extern "C" void func_80332BF4(void* _this, void const*, void const*);
+extern "C" void func_80332C0C(void* _this, void const*, void const*);
+extern "C" void func_80332C24(void* _this, void const*, void const*);
+extern "C" void func_80332C3C(void* _this, void const*, void const*);
+extern "C" void func_80332C54(void* _this, void const*, void const*);
+extern "C" void func_80332C6C(void* _this, void const*, void const*);
+extern "C" void func_80332C84(void* _this, void const*, void const*);
+extern "C" void func_80332C9C(void* _this, void const*, void const*);
+extern "C" void func_80332CB4(void* _this, void const*, void const*);
+extern "C" void func_80332CCC(void* _this, void const*, void const*);
+extern "C" void func_80332CE4(void* _this, void const*, void const*);
+extern "C" void func_80332CFC(void* _this, void const*, void const*);
+extern "C" void func_80332D14(void* _this, void const*, void const*);
+extern "C" void func_80332D2C(void* _this, void const*, void const*);
+extern "C" void func_80332D44(void* _this, void const*, void const*);
+extern "C" void func_80332D5C(void* _this, void const*, void const*);
+extern "C" void func_80332D74(void* _this, void const*, void const*);
+extern "C" void func_80332D8C(void* _this, void const*, void const*);
 
 //
 // External References:
@@ -475,11 +474,11 @@ extern "C" void setLight__13J3DColorBlockFUlP11J3DLightObj();
 extern "C" void setAmbColor__13J3DColorBlockFUlPC10J3DGXColor();
 extern "C" void* __nw__FUl();
 extern "C" void __dl__FPv();
-extern "C" void func_802F41E8(void const*, void const*);
-extern "C" void func_802F4260(void const*, void const*);
-extern "C" void func_802F4278(void const*, void const*);
-extern "C" void func_802F4290(void const*, void const*);
-extern "C" void func_802F42C0(void const*, void const*);
+extern "C" void func_802F41E8(void* _this, void const*, void const*);
+extern "C" void func_802F4260(void* _this, void const*, void const*);
+extern "C" void func_802F4278(void* _this, void const*, void const*);
+extern "C" void func_802F4290(void* _this, void const*, void const*);
+extern "C" void func_802F42C0(void* _this, void const*, void const*);
 extern "C" void setSingleDisplayList__17J3DDisplayListObjFPvUl();
 extern "C" void createColorBlock__11J3DMaterialFUl();
 extern "C" void createTexGenBlock__11J3DMaterialFUl();
@@ -1412,7 +1411,7 @@ asm J3DMaterial::~J3DMaterial() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332BDC(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332BDC(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332BDC.s"
 }
@@ -1423,7 +1422,7 @@ extern "C" asm void func_80332BDC(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332BF4(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332BF4(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332BF4.s"
 }
@@ -1434,7 +1433,7 @@ extern "C" asm void func_80332BF4(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332C0C(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332C0C(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C0C.s"
 }
@@ -1445,7 +1444,7 @@ extern "C" asm void func_80332C0C(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332C24(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332C24(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C24.s"
 }
@@ -1456,7 +1455,7 @@ extern "C" asm void func_80332C24(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332C3C(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332C3C(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C3C.s"
 }
@@ -1467,7 +1466,7 @@ extern "C" asm void func_80332C3C(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332C54(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332C54(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C54.s"
 }
@@ -1478,7 +1477,7 @@ extern "C" asm void func_80332C54(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332C6C(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332C6C(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C6C.s"
 }
@@ -1489,7 +1488,7 @@ extern "C" asm void func_80332C6C(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332C84(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332C84(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C84.s"
 }
@@ -1500,7 +1499,7 @@ extern "C" asm void func_80332C84(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332C9C(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332C9C(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332C9C.s"
 }
@@ -1511,7 +1510,7 @@ extern "C" asm void func_80332C9C(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332CB4(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332CB4(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332CB4.s"
 }
@@ -1522,7 +1521,7 @@ extern "C" asm void func_80332CB4(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332CCC(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332CCC(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332CCC.s"
 }
@@ -1533,7 +1532,7 @@ extern "C" asm void func_80332CCC(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332CE4(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332CE4(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332CE4.s"
 }
@@ -1544,7 +1543,7 @@ extern "C" asm void func_80332CE4(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332CFC(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332CFC(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332CFC.s"
 }
@@ -1555,7 +1554,7 @@ extern "C" asm void func_80332CFC(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332D14(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332D14(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D14.s"
 }
@@ -1566,7 +1565,7 @@ extern "C" asm void func_80332D14(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332D2C(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332D2C(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D2C.s"
 }
@@ -1577,7 +1576,7 @@ extern "C" asm void func_80332D2C(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332D44(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332D44(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D44.s"
 }
@@ -1588,7 +1587,7 @@ extern "C" asm void func_80332D44(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332D5C(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332D5C(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D5C.s"
 }
@@ -1599,7 +1598,7 @@ extern "C" asm void func_80332D5C(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332D74(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332D74(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D74.s"
 }
@@ -1610,7 +1609,7 @@ extern "C" asm void func_80332D74(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80332D8C(void const* param_0, void const* param_1) {
+extern "C" asm void func_80332D8C(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory/func_80332D8C.s"
 }
diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
index d4769de6ef..b94a6fcfa2 100644
--- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
+++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
@@ -22,6 +22,8 @@ struct J3DTevStage {
     /* 8003AACC */ J3DTevStage(J3DTevStageInfo const&);
 };
 
+struct J3DMaterialBlock_v21 {};
+
 struct J3DMaterial {
     /* 803157A0 */ void createColorBlock(u32);
     /* 803159A0 */ void createTexGenBlock(u32);
@@ -31,8 +33,6 @@ struct J3DMaterial {
     /* 80316240 */ void initialize();
 };
 
-struct J3DMaterialBlock_v21 {};
-
 struct J3DMaterialFactory_v21 {
     /* 80332DA4 */ J3DMaterialFactory_v21(J3DMaterialBlock_v21 const&);
     /* 80332F84 */ void countUniqueMaterials();
@@ -96,7 +96,7 @@ extern "C" void newZMode__22J3DMaterialFactory_v21CFi();
 extern "C" void newZCompLoc__22J3DMaterialFactory_v21CFi();
 extern "C" void newDither__22J3DMaterialFactory_v21CFi();
 extern "C" void newNBTScale__22J3DMaterialFactory_v21CFi();
-extern "C" void func_80334118(void const*, void const*);
+extern "C" void func_80334118(void* _this, void const*, void const*);
 
 //
 // External References:
@@ -105,11 +105,11 @@ extern "C" void func_80334118(void const*, void const*);
 extern "C" void __ct__11J3DTevStageFv();
 extern "C" void __ct__11J3DTevStageFRC15J3DTevStageInfo();
 extern "C" void* __nw__FUl();
-extern "C" void func_802F41E8(void const*, void const*);
-extern "C" void func_802F4260(void const*, void const*);
-extern "C" void func_802F4278(void const*, void const*);
-extern "C" void func_802F4290(void const*, void const*);
-extern "C" void func_802F42C0(void const*, void const*);
+extern "C" void func_802F41E8(void* _this, void const*, void const*);
+extern "C" void func_802F4260(void* _this, void const*, void const*);
+extern "C" void func_802F4278(void* _this, void const*, void const*);
+extern "C" void func_802F4290(void* _this, void const*, void const*);
+extern "C" void func_802F42C0(void* _this, void const*, void const*);
 extern "C" void createColorBlock__11J3DMaterialFUl();
 extern "C" void createTexGenBlock__11J3DMaterialFUl();
 extern "C" void createTevBlock__11J3DMaterialFi();
@@ -118,19 +118,19 @@ extern "C" void createPEBlock__11J3DMaterialFUlUl();
 extern "C" void initialize__11J3DMaterialFv();
 extern "C" void __as__13J3DTexMtxInfoFRC13J3DTexMtxInfo();
 extern "C" void __as__10J3DFogInfoFRC10J3DFogInfo();
-extern "C" void func_80332C24(void const*, void const*);
-extern "C" void func_80332C3C(void const*, void const*);
-extern "C" void func_80332C54(void const*, void const*);
-extern "C" void func_80332C6C(void const*, void const*);
-extern "C" void func_80332C84(void const*, void const*);
-extern "C" void func_80332C9C(void const*, void const*);
-extern "C" void func_80332CB4(void const*, void const*);
-extern "C" void func_80332CCC(void const*, void const*);
-extern "C" void func_80332CE4(void const*, void const*);
-extern "C" void func_80332CFC(void const*, void const*);
-extern "C" void func_80332D14(void const*, void const*);
-extern "C" void func_80332D2C(void const*, void const*);
-extern "C" void func_80332D5C(void const*, void const*);
+extern "C" void func_80332C24(void* _this, void const*, void const*);
+extern "C" void func_80332C3C(void* _this, void const*, void const*);
+extern "C" void func_80332C54(void* _this, void const*, void const*);
+extern "C" void func_80332C6C(void* _this, void const*, void const*);
+extern "C" void func_80332C84(void* _this, void const*, void const*);
+extern "C" void func_80332C9C(void* _this, void const*, void const*);
+extern "C" void func_80332CB4(void* _this, void const*, void const*);
+extern "C" void func_80332CCC(void* _this, void const*, void const*);
+extern "C" void func_80332CE4(void* _this, void const*, void const*);
+extern "C" void func_80332CFC(void* _this, void const*, void const*);
+extern "C" void func_80332D14(void* _this, void const*, void const*);
+extern "C" void func_80332D2C(void* _this, void const*, void const*);
+extern "C" void func_80332D5C(void* _this, void const*, void const*);
 extern "C" void _savegpr_19();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_19();
@@ -438,7 +438,7 @@ asm void J3DMaterialFactory_v21::newNBTScale(int param_0) const {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80334118(void const* param_0, void const* param_1) {
+extern "C" asm void func_80334118(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DMaterialFactory_v21/func_80334118.s"
 }
diff --git a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp
index 0b050dd574..91937fdd9f 100644
--- a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+++ b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp
@@ -67,16 +67,16 @@ template <typename A0, typename B0>
 struct J3DMtxCalcNoAnm {};
 /* J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformSoftimage, J3DMtxCalcJ3DSysInitSoftimage> */
 struct J3DMtxCalcNoAnm__template1 {
-    /* 803364B8 */ void func_803364B8();
-    /* 80336524 */ void func_80336524(Vec const&, f32 const (&)[3][4]);
-    /* 8033656C */ void func_8033656C();
+    /* 803364B8 */ void func_803364B8(void* _this);
+    /* 80336524 */ void func_80336524(void* _this, Vec const&, f32 const (&)[3][4]);
+    /* 8033656C */ void func_8033656C(void* _this);
 };
 
 /* J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformBasic, J3DMtxCalcJ3DSysInitBasic> */
 struct J3DMtxCalcNoAnm__template2 {
-    /* 80336594 */ void func_80336594();
-    /* 80336600 */ void func_80336600(Vec const&, f32 const (&)[3][4]);
-    /* 80336628 */ void func_80336628();
+    /* 80336594 */ void func_80336594(void* _this);
+    /* 80336600 */ void func_80336600(void* _this, Vec const&, f32 const (&)[3][4]);
+    /* 80336628 */ void func_80336628(void* _this);
 };
 
 struct J3DMtxCalcJ3DSysInitBasic {
@@ -126,15 +126,15 @@ struct J3DModelLoaderDataBase {
     /* 803346BC */ void load(void const*, u32);
 };
 
-struct J3DModelInfoBlock {};
+struct J3DDrawBlock {};
 
-struct J3DJointBlock {};
+struct J3DMaterialDLBlock {};
 
-struct J3DDrawBlock {};
+struct J3DJointBlock {};
 
 struct J3DEnvelopeBlock {};
 
-struct J3DMaterialDLBlock {};
+struct J3DModelInfoBlock {};
 
 struct J3DModelLoader {
     /* 8033468C */ J3DModelLoader();
@@ -249,21 +249,21 @@ extern "C" void readMaterialTable_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21
 extern "C" void readMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl();
 extern "C" bool calcSizeMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl();
 extern "C" bool calcSizeMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl();
-extern "C" void func_803364B8();
-extern "C" void func_80336524(Vec const&, f32 const (&)[3][4]);
-extern "C" void func_8033656C();
-extern "C" void func_80336594();
-extern "C" void func_80336600(Vec const&, f32 const (&)[3][4]);
-extern "C" void func_80336628();
+extern "C" void func_803364B8(void* _this);
+extern "C" void func_80336524(void* _this, Vec const&, f32 const (&)[3][4]);
+extern "C" void func_8033656C(void* _this);
+extern "C" void func_80336594(void* _this);
+extern "C" void func_80336600(void* _this, Vec const&, f32 const (&)[3][4]);
+extern "C" void func_80336628(void* _this);
 extern "C" void __ct__11J3DMaterialFv();
 extern "C" void __dt__10J3DTextureFv();
-extern "C" void func_803366EC(void const*, void const*);
-extern "C" void func_80336704(void const*, void const*);
-extern "C" void func_8033671C(void const*, void const*);
-extern "C" void func_80336734(void const*, void const*);
-extern "C" void func_8033674C(void const*, void const*);
-extern "C" void func_80336764(void const*, u32);
-extern "C" void func_8033677C(void const*, u32);
+extern "C" void func_803366EC(void* _this, void const*, void const*);
+extern "C" void func_80336704(void* _this, void const*, void const*);
+extern "C" void func_8033671C(void* _this, void const*, void const*);
+extern "C" void func_80336734(void* _this, void const*, void const*);
+extern "C" void func_8033674C(void* _this, void const*, void const*);
+extern "C" void func_80336764(void* _this, void const*, u32);
+extern "C" void func_8033677C(void* _this, void const*, u32);
 extern "C" extern char const* const J3DModelLoader__stringBase0;
 
 //
@@ -283,10 +283,10 @@ extern "C" void* __nwa__FUl();
 extern "C" void* __nwa__FUli();
 extern "C" void __dl__FPv();
 extern "C" void __ct__10JUTNameTabFPC7ResNTAB();
-extern "C" void func_802F4260(void const*, void const*);
-extern "C" void func_802F42C0(void const*, void const*);
-extern "C" void func_8030A530(void const*, void const*);
-extern "C" void func_8030A560(void const*, void const*);
+extern "C" void func_802F4260(void* _this, void const*, void const*);
+extern "C" void func_802F42C0(void* _this, void const*, void const*);
+extern "C" void func_8030A530(void* _this, void const*, void const*);
+extern "C" void func_8030A560(void* _this, void const*, void const*);
 extern "C" void initialize__11J3DMaterialFv();
 extern "C" void initShapeNodes__13J3DShapeTableFP14J3DDrawMtxDataP13J3DVertexData();
 extern "C" void sortVcdVatCmd__13J3DShapeTableFv();
@@ -470,6 +470,13 @@ asm void J3DModelLoaderDataBase::load(void const* param_0, u32 param_1) {
 }
 #pragma pop
 
+/* ############################################################################################## */
+/* 803A20B0-803A20B0 02E710 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_803A20B0 = "Unknown data block\n";
+#pragma pop
+
 /* 803347E0-80334ABC 32F120 02DC+00 4/1 0/0 0/0 .text            load__14J3DModelLoaderFPCvUl */
 #pragma push
 #pragma optimization_level 0
@@ -501,6 +508,13 @@ asm void J3DModelLoader::loadBinaryDisplayList(void const* param_0, u32 param_1)
 }
 #pragma pop
 
+/* ############################################################################################## */
+/* 803A20B0-803A20B0 02E710 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_803A20C4 = "WRONG SHAPE MATRIX TYPE (__FILE__)\n";
+#pragma pop
+
 /* 80334EE0-80335048 32F820 0168+00 3/0 0/0 0/0 .text            setupBBoardInfo__14J3DModelLoaderFv
  */
 #pragma push
@@ -759,7 +773,7 @@ bool J3DModelLoader::calcSizeMaterialTable(J3DMaterialBlock const* param_0, u32
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_803364B8() {
+extern "C" asm void func_803364B8(void* _this) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_803364B8.s"
 }
@@ -771,7 +785,7 @@ extern "C" asm void func_803364B8() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80336524(Vec const& param_0, f32 const (&param_1)[3][4]) {
+extern "C" asm void func_80336524(void* _this, Vec const& param_0, f32 const (&param_1)[3][4]) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336524.s"
 }
@@ -782,7 +796,7 @@ extern "C" asm void func_80336524(Vec const& param_0, f32 const (&param_1)[3][4]
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_8033656C() {
+extern "C" asm void func_8033656C(void* _this) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_8033656C.s"
 }
@@ -793,7 +807,7 @@ extern "C" asm void func_8033656C() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80336594() {
+extern "C" asm void func_80336594(void* _this) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336594.s"
 }
@@ -805,7 +819,7 @@ extern "C" asm void func_80336594() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80336600(Vec const& param_0, f32 const (&param_1)[3][4]) {
+extern "C" asm void func_80336600(void* _this, Vec const& param_0, f32 const (&param_1)[3][4]) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336600.s"
 }
@@ -816,7 +830,7 @@ extern "C" asm void func_80336600(Vec const& param_0, f32 const (&param_1)[3][4]
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80336628() {
+extern "C" asm void func_80336628(void* _this) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336628.s"
 }
@@ -846,7 +860,7 @@ asm J3DTexture::~J3DTexture() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_803366EC(void const* param_0, void const* param_1) {
+extern "C" asm void func_803366EC(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_803366EC.s"
 }
@@ -856,7 +870,7 @@ extern "C" asm void func_803366EC(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80336704(void const* param_0, void const* param_1) {
+extern "C" asm void func_80336704(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336704.s"
 }
@@ -867,7 +881,7 @@ extern "C" asm void func_80336704(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_8033671C(void const* param_0, void const* param_1) {
+extern "C" asm void func_8033671C(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_8033671C.s"
 }
@@ -878,7 +892,7 @@ extern "C" asm void func_8033671C(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80336734(void const* param_0, void const* param_1) {
+extern "C" asm void func_80336734(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336734.s"
 }
@@ -889,7 +903,7 @@ extern "C" asm void func_80336734(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_8033674C(void const* param_0, void const* param_1) {
+extern "C" asm void func_8033674C(void* _this, void const* param_0, void const* param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_8033674C.s"
 }
@@ -900,7 +914,7 @@ extern "C" asm void func_8033674C(void const* param_0, void const* param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80336764(void const* param_0, u32 param_1) {
+extern "C" asm void func_80336764(void* _this, void const* param_0, u32 param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_80336764.s"
 }
@@ -911,16 +925,10 @@ extern "C" asm void func_80336764(void const* param_0, u32 param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_8033677C(void const* param_0, u32 param_1) {
+extern "C" asm void func_8033677C(void* _this, void const* param_0, u32 param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DModelLoader/func_8033677C.s"
 }
 #pragma pop
 
-/* 803A20B0-803A20E8 02E710 0038+00 4/4 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_803A20B0 = "Unknown data block\n";
-SECTION_DEAD static char const* const stringBase_803A20C4 = "WRONG SHAPE MATRIX TYPE (__FILE__)\n";
-#pragma pop
+/* 803A20B0-803A20B0 02E710 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
index 6d82ff98b9..d7d99e6dd3 100644
--- a/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
+++ b/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
@@ -28,15 +28,15 @@ struct J3DModelLoader_v26 {
     /* 80336F60 */ void calcSizeMaterialTable(J3DMaterialBlock const*, u32);
 };
 
-struct J3DModelInfoBlock {};
+struct J3DDrawBlock {};
 
-struct J3DJointBlock {};
+struct J3DMaterialDLBlock {};
 
-struct J3DDrawBlock {};
+struct J3DJointBlock {};
 
 struct J3DEnvelopeBlock {};
 
-struct J3DMaterialDLBlock {};
+struct J3DModelInfoBlock {};
 
 struct J3DModelLoader {
     /* 80336794 */ void countMaterialNum(void const*);
@@ -96,7 +96,7 @@ extern "C" void __ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock();
 extern "C" void countUniqueMaterials__18J3DMaterialFactoryFv();
 extern "C" void
 calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl();
-extern "C" void func_8033674C(void const*, void const*);
+extern "C" void func_8033674C(void* _this, void const*, void const*);
 extern "C" void __ct__15J3DShapeFactoryFRC13J3DShapeBlock();
 extern "C" void calcSize__15J3DShapeFactoryFiUl();
 extern "C" void calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl();
@@ -123,6 +123,15 @@ asm void J3DModelLoader::countMaterialNum(void const* param_0) {
 }
 #pragma pop
 
+/* ############################################################################################## */
+/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_803A20E8 = "Unknown data block\n";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_803A20FC = "\0\0\0";
+#pragma pop
+
 /* 803367D4-803369A0 331114 01CC+00 0/0 3/0 0/0 .text calcLoadSize__14J3DModelLoaderFPCvUl */
 #pragma push
 #pragma optimization_level 0
@@ -276,11 +285,4 @@ asm void J3DModelLoader::calcSizeMaterialDL(J3DMaterialDLBlock const* param_0, u
 }
 #pragma pop
 
-/* 803A20E8-803A2100 02E748 0014+04 3/3 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_803A20E8 = "Unknown data block\n";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_803A20FC = "\0\0\0";
-#pragma pop
+/* 803A20E8-803A20E8 02E748 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
index 7493367bfb..1f872b3228 100644
--- a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
+++ b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
@@ -46,10 +46,10 @@ extern "C" void allocVcdVatCmdBuffer__15J3DShapeFactoryFUl();
 extern "C" void calcSize__15J3DShapeFactoryFiUl();
 extern "C" void calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl();
 extern "C" void calcSizeShapeMtx__15J3DShapeFactoryCFUlii();
-extern "C" void func_80337AE0(void const*, u32);
-extern "C" void func_80337AF8(void const*, u32);
-extern "C" void func_80337B10(void const*, u32);
-extern "C" void func_80337B28(void const*, u32);
+extern "C" void func_80337AE0(void* _this, void const*, u32);
+extern "C" void func_80337AF8(void* _this, void const*, u32);
+extern "C" void func_80337B10(void* _this, void const*, u32);
+extern "C" void func_80337B28(void* _this, void const*, u32);
 extern "C" extern char const* const J3DShapeFactory__stringBase0;
 
 //
@@ -62,8 +62,8 @@ extern "C" void* __nwa__FUl();
 extern "C" void* __nwa__FUli();
 extern "C" void __ct__12J3DShapeDrawFPCUcUl();
 extern "C" void initialize__8J3DShapeFv();
-extern "C" void func_80336764(void const*, u32);
-extern "C" void func_8033677C(void const*, u32);
+extern "C" void func_80336764(void* _this, void const*, u32);
+extern "C" void func_8033677C(void* _this, void const*, u32);
 extern "C" void _savegpr_26();
 extern "C" void _savegpr_29();
 extern "C" void _restgpr_26();
@@ -101,6 +101,16 @@ asm void J3DShapeFactory::create(int param_0, u32 param_1, _GXVtxDescList* param
 }
 #pragma pop
 
+/* ############################################################################################## */
+/* 803A2100-803A2100 02E760 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_803A2100 =
+    "WRONG SHAPE MATRIX TYPE (J3DModelInit.cpp)\n";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_803A212C = "\0\0\0";
+#pragma pop
+
 /* 803375BC-8033784C 331EFC 0290+00 1/1 0/0 0/0 .text newShapeMtx__15J3DShapeFactoryCFUlii */
 #pragma push
 #pragma optimization_level 0
@@ -169,7 +179,7 @@ asm void J3DShapeFactory::calcSizeShapeMtx(u32 param_0, int param_1, int param_2
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80337AE0(void const* param_0, u32 param_1) {
+extern "C" asm void func_80337AE0(void* _this, void const* param_0, u32 param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337AE0.s"
 }
@@ -180,7 +190,7 @@ extern "C" asm void func_80337AE0(void const* param_0, u32 param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80337AF8(void const* param_0, u32 param_1) {
+extern "C" asm void func_80337AF8(void* _this, void const* param_0, u32 param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337AF8.s"
 }
@@ -191,7 +201,7 @@ extern "C" asm void func_80337AF8(void const* param_0, u32 param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80337B10(void const* param_0, u32 param_1) {
+extern "C" asm void func_80337B10(void* _this, void const* param_0, u32 param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337B10.s"
 }
@@ -202,18 +212,10 @@ extern "C" asm void func_80337B10(void const* param_0, u32 param_1) {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-extern "C" asm void func_80337B28(void const* param_0, u32 param_1) {
+extern "C" asm void func_80337B28(void* _this, void const* param_0, u32 param_1) {
     nofralloc
 #include "asm/JSystem/J3DGraphLoader/J3DShapeFactory/func_80337B28.s"
 }
 #pragma pop
 
-/* 803A2100-803A2130 02E760 002C+04 2/2 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_803A2100 =
-    "WRONG SHAPE MATRIX TYPE (J3DModelInit.cpp)\n";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_803A212C = "\0\0\0";
-#pragma pop
+/* 803A2100-803A2100 02E760 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */