J3D setup (#155)

* setup j3d classes

* remove asm

* fixes

* fix newDifferedDisplayList

11 files changed, 61 insertions, 424 deletions

diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp
index 36dfda63eb..2b04c61fcb 100644
--- a/src/c/c_damagereaction.cpp
+++ b/src/c/c_damagereaction.cpp
@@ -162,7 +162,7 @@ REGISTER_CTORS(0x80018388, __sinit_c_damagereaction_cpp);
 
 /* 800183D4-800183D8 012D14 0004+00 1/0 1/0 0/0 .text
  * execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle */
-void JPAParticleCallBack::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
+extern "C" void execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle() {
     /* empty function */
 }
 
diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp
index 81f45e0186..8eaab84536 100644
--- a/src/d/a/d_a_alink.cpp
+++ b/src/d/a/d_a_alink.cpp
@@ -26,8 +26,6 @@ struct mDoMtx_stack_c {
     static u8 now[48];
 };
 
-struct J3DAnmCluster {};
-
 struct mDoExt_blkAnm {
     /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16);
 };
@@ -98,8 +96,6 @@ struct daCrod_c {
     /* 80141A94 */ void setControllActorData();
 };
 
-struct J3DMaterial {};
-
 struct daAlink_matAnm_c {
     /* 8009D8E4 */ void init();
     /* 8009D90C */ void calc(J3DMaterial*) const;
@@ -677,49 +673,12 @@ struct JAISeq {
     /* 802A0A8C */ JAISeq(JAISeqMgr*, JAISoundStrategyMgr<JAISeq>*);
 };
 
-struct J3DTexNoAnm {
-    /* 8003B1F8 */ ~J3DTexNoAnm();
-    /* 8003B240 */ J3DTexNoAnm();
-};
-
-struct J3DTexMtxAnm {
-    /* 8003B264 */ ~J3DTexMtxAnm();
-    /* 8003B2A0 */ J3DTexMtxAnm();
-};
-
-struct J3DTevKColorAnm {
-    /* 8003B150 */ ~J3DTevKColorAnm();
-    /* 8003B18C */ J3DTevKColorAnm();
-};
-
-struct J3DTevColorAnm {
-    /* 8003B1A4 */ ~J3DTevColorAnm();
-    /* 8003B1E0 */ J3DTevColorAnm();
-};
-
-struct J3DTevBlock {
-    /* 80110E80 */ void setTevColor(u32, J3DGXColorS10 const*);
-};
-
-struct J3DShape {
-    /* 80315300 */ void loadPreDrawSetting() const;
-
-    static u8 sOldVcdVatCmd[4];
-};
-
 struct J3DMaterialAnm {
     /* 800A4820 */ ~J3DMaterialAnm();
     /* 8032C320 */ void initialize();
     /* 8032C3C4 */ void calc(J3DMaterial*) const;
 };
 
-struct J3DMatColorAnm {
-    /* 8003B2B8 */ ~J3DMatColorAnm();
-    /* 8003B2F4 */ J3DMatColorAnm();
-};
-
-struct J3DJoint {};
-
 struct J3DAnmLoaderDataBaseFlag {};
 
 struct J3DAnmLoaderDataBase {
@@ -17697,9 +17656,9 @@ asm void daAlink_c::setFrontRollCrashShock(u8 param_0) {
 #pragma pop
 
 /* 800C1DAC-800C1DE0 0BC6EC 0034+00 1/0 0/0 0/0 .text            getModelJointMtx__9daAlink_cFUs */
-Mtx* daAlink_c::getModelJointMtx(u16 param_0) {
+MtxP daAlink_c::getModelJointMtx(u16 param_0) {
     if (param_0 >= field_0x30c6) {
-        return &field_0x0650->mBaseTransformMtx;
+        return field_0x0650->mBaseTransformMtx;
     }
     return field_0x0650->i_getAnmMtx(param_0);
 }
@@ -20115,7 +20074,8 @@ asm bool daAlink_c::checkWolfDownAttackPullOut() const {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm bool daAlink_c::getMidnaAtnPos() const {
+extern "C" asm void getMidnaAtnPos__9daAlink_cCFv() {
+    // asm bool daAlink_c::getMidnaAtnPos() const {
     nofralloc
 #include "asm/d/a/d_a_alink/getMidnaAtnPos__9daAlink_cCFv.s"
 }
@@ -31544,7 +31504,9 @@ asm void daAlink_c::setRunSplash() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void dAlink_bottleWaterPcallBack_c::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
+extern "C" asm void execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle() {
+    // asm void dAlink_bottleWaterPcallBack_c::execute(JPABaseEmitter* param_0, JPABaseParticle*
+    // param_1) {
     nofralloc
 #include "asm/d/a/d_a_alink/execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle.s"
 }
@@ -31714,7 +31676,8 @@ SECTION_SDATA static u8 nColor0[4] = {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daAlink_blur_c::draw() {
+extern "C" asm void draw__14daAlink_blur_cFv() {
+    // asm void daAlink_blur_c::draw() {
     nofralloc
 #include "asm/d/a/d_a_alink/draw__14daAlink_blur_cFv.s"
 }
@@ -31754,7 +31717,8 @@ asm void daAlink_lockCursor_c::update() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daAlink_lockCursor_c::draw() {
+extern "C" asm void draw__20daAlink_lockCursor_cFv() {
+    // asm void daAlink_lockCursor_c::draw() {
     nofralloc
 #include "asm/d/a/d_a_alink/draw__20daAlink_lockCursor_cFv.s"
 }
@@ -31774,7 +31738,8 @@ asm void daAlink_sight_c::create() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daAlink_sight_c::draw() {
+extern "C" asm void draw__15daAlink_sight_cFv() {
+    // asm void daAlink_sight_c::draw() {
     nofralloc
 #include "asm/d/a/d_a_alink/draw__15daAlink_sight_cFv.s"
 }
@@ -35130,7 +35095,8 @@ int daPy_py_c::checkEndResetFlg0(daPy_ERFLG0 pFlag) const {
 }
 
 /* 80141500-80141508 13BE40 0008+00 1/0 0/0 0/0 .text            getMidnaAtnPos__9daPy_py_cCFv */
-bool daPy_py_c::getMidnaAtnPos() const {
+extern "C" bool getMidnaAtnPos__9daPy_py_cCFv() {
+    // bool daPy_py_c::getMidnaAtnPos() const {
     return false;
 }
 
diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp
index 826b55ab03..2291f5c8cb 100644
--- a/src/d/a/d_a_player.cpp
+++ b/src/d/a/d_a_player.cpp
@@ -25,10 +25,6 @@ struct JMath {
     static u8 sincosTable_[65536];
 };
 
-struct J3DShape {
-    static u8 sOldVcdVatCmd[4];
-};
-
 struct J3DAnmLoaderDataBaseFlag {};
 
 struct J3DAnmLoaderDataBase {
@@ -748,7 +744,8 @@ SECTION_SDATA2 static u32 lit_4669 = 0x321400FF;
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm void daPy_sightPacket_c::draw() {
+extern "C" asm void draw__18daPy_sightPacket_cFv() {
+    // asm void daPy_sightPacket_c::draw() {
     nofralloc
 #include "asm/d/a/d_a_player/draw__18daPy_sightPacket_cFv.s"
 }
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index a1913a85b0..61117fabb1 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -35,12 +35,6 @@ struct Z2AudioMgr {
     static u8 mAudioMgrPtr[4 + 4 /* padding */];
 };
 
-struct J3DGXColor {};
-
-struct J3DTevBlock {
-    /* 800732AC */ void setTevKColor(u32, J3DGXColor const*);
-};
-
 //
 // Forward References:
 //
diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp
index 12820dda0e..693147dc5a 100644
--- a/src/d/d_eye_hl.cpp
+++ b/src/d/d_eye_hl.cpp
@@ -8,14 +8,6 @@
 #include "dolphin/types.h"
 
 //
-// Types:
-//
-
-struct JUTNameTab {
-    /* 802DEAF8 */ void getName(u16) const;
-};
-
-//
 // Forward References:
 //
 
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index 746a747ecd..b03b1e7cca 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -4,6 +4,13 @@
 //
 
 #include "d/d_resorce.h"
+#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
+#include "JSystem/J3DGraphBase/J3DMaterial.h"
+#include "JSystem/J3DGraphBase/J3DTevs.h"
+#include "JSystem/J3DGraphBase/J3DTexture.h"
+#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
+#include "JSystem/J3DGraphLoader/J3DClusterLoader.h"
+#include "JSystem/J3DGraphLoader/J3DModelLoader.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
@@ -32,84 +39,6 @@ struct dBgWKCol {
     /* 8007E7D0 */ void initKCollision(void*);
 };
 
-struct J3DTexture {
-    /* 8031221C */ void addResTIMG(u16, ResTIMG const*);
-};
-
-struct J3DTexNoAnm {
-    /* 8003B1F8 */ ~J3DTexNoAnm();
-    /* 8003B240 */ J3DTexNoAnm();
-    /* 8003C82C */ void calc(u16*) const;
-};
-
-struct J3DTexMtxInfo {
-    /* 80325718 */ void operator=(J3DTexMtxInfo const&);
-};
-
-struct J3DTexMtxAnm {
-    /* 8003B264 */ ~J3DTexMtxAnm();
-    /* 8003B2A0 */ J3DTexMtxAnm();
-};
-
-struct J3DTexMtx {};
-
-struct J3DTexGenBlock {
-    /* 8003AB2C */ void setTexMtx(u32, J3DTexMtx*);
-};
-
-struct J3DTevStageInfo {};
-
-struct J3DTevStage {
-    /* 8000E298 */ void setTevStageInfo(J3DTevStageInfo const&);
-    /* 8003AACC */ J3DTevStage(J3DTevStageInfo const&);
-};
-
-struct J3DTevKColorAnm {
-    /* 8003B150 */ ~J3DTevKColorAnm();
-    /* 8003B18C */ J3DTevKColorAnm();
-};
-
-struct J3DTevColorAnm {
-    /* 8003B1A4 */ ~J3DTevColorAnm();
-    /* 8003B1E0 */ J3DTevColorAnm();
-};
-
-struct J3DShape {
-    /* 80314BB8 */ void addTexMtxIndexInDL(_GXAttr, u32);
-    /* 80314CBC */ void addTexMtxIndexInVcd(_GXAttr);
-};
-
-struct J3DModelLoaderDataBase {
-    /* 803346BC */ void load(void const*, u32);
-};
-
-struct J3DMaterialAnm {
-    /* 8032C320 */ void initialize();
-};
-
-struct J3DMatColorAnm {
-    /* 8003B2B8 */ ~J3DMatColorAnm();
-    /* 8003B2F4 */ J3DMatColorAnm();
-};
-
-struct J3DClusterLoaderDataBase {
-    /* 80334130 */ void load(void const*);
-};
-
-struct J3DAnmTransformKey {
-    /* 8003B8D0 */ ~J3DAnmTransformKey();
-    /* 8003C800 */ s32 getKind() const;
-    /* 8003C808 */ void getTransform(u16, J3DTransformInfo*) const;
-    /* 80329A34 */ void calcTransform(f32, u16, J3DTransformInfo*) const;
-};
-
-struct J3DAnmLoaderDataBaseFlag {};
-
-struct J3DAnmLoaderDataBase {
-    /* 80337B40 */ void load(void const*, J3DAnmLoaderDataBaseFlag);
-    /* 80338134 */ void setResource(J3DAnmBase*, void const*);
-};
-
 //
 // Forward References:
 //
@@ -232,7 +161,6 @@ extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
 extern "C" void memcmp();
-extern "C" extern u8 const j3dDefaultMtx[48];
 extern "C" extern void* __vt__14J3DMaterialAnm[4];
 extern "C" u8 now__14mDoMtx_stack_c[48];
 extern "C" extern u8 g_env_light[4880];
@@ -289,14 +217,20 @@ int dRes_info_c::set(char const* pArcName, char const* pArcPath, u8 param_2, JKR
 }
 
 /* 8003A3F0-8003A490 034D30 00A0+00 1/1 0/0 0/0 .text            setAlpha__FP16J3DMaterialTable */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void setAlpha(J3DMaterialTable* param_0) {
-    nofralloc
-#include "asm/d/d_resorce/setAlpha__FP16J3DMaterialTable.s"
+static void setAlpha(J3DMaterialTable* pMatTable) {
+    for (u16 i = 0; i < pMatTable->getMaterialNum(); i++) {
+        J3DMaterial* mat = pMatTable->getMaterialNodePointer(i);
+        J3DTevBlock* tevBlock = mat->getTevBlock();
+
+        if (tevBlock != NULL) {
+            _GXColorS10* tevColor = tevBlock->getTevColor(3);
+            if (tevColor != NULL) {
+                u8 tevStageNum = tevBlock->getTevStageNum();
+                tevColor->a = tevStageNum;
+            }
+        }
+    }
 }
-#pragma pop
 
 /* ############################################################################################## */
 /* 803798B8-803798B8 005F18 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
@@ -318,14 +252,9 @@ static asm void setIndirectTex(J3DModelData* param_0) {
 #pragma pop
 
 /* 8003A81C-8003A840 03515C 0024+00 1/1 0/0 0/0 .text            setAlpha__FP12J3DModelData */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-static asm void setAlpha(J3DModelData* param_0) {
-    nofralloc
-#include "asm/d/d_resorce/setAlpha__FP12J3DModelData.s"
+static void setAlpha(J3DModelData* pModelData) {
+    setAlpha(&pModelData->getMaterialTable());
 }
-#pragma pop
 
 /* ############################################################################################## */
 /* 80379840-803798A4 005EA0 0064+00 2/2 0/0 0/0 .rodata          l_texMtxInfo */
@@ -624,7 +553,8 @@ asm int dRes_info_c::loadResource() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DAnmTransformKey::~J3DAnmTransformKey() {
+extern "C" asm void __dt__18J3DAnmTransformKeyFv() {
+    // asm J3DAnmTransformKey::~J3DAnmTransformKey() {
     nofralloc
 #include "asm/d/d_resorce/__dt__18J3DAnmTransformKeyFv.s"
 }
@@ -634,7 +564,8 @@ asm J3DAnmTransformKey::~J3DAnmTransformKey() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DAnmTransform::~J3DAnmTransform() {
+extern "C" asm void __dt__15J3DAnmTransformFv() {
+    // asm J3DAnmTransform::~J3DAnmTransform() {
     nofralloc
 #include "asm/d/d_resorce/__dt__15J3DAnmTransformFv.s"
 }
@@ -1149,15 +1080,16 @@ int dRes_control_c::getObjectResName2Index(char const* arcName, char const* para
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-asm J3DAnmBase::~J3DAnmBase() {
+extern "C" asm void __dt__10J3DAnmBaseFv() {
+    // asm J3DAnmBase::~J3DAnmBase() {
     nofralloc
 #include "asm/d/d_resorce/__dt__10J3DAnmBaseFv.s"
 }
 #pragma pop
 
 /* 8003C77C-8003C784 0370BC 0008+00 1/0 0/0 0/0 .text            getKind__15J3DAnmTransformCFv */
-bool J3DAnmTransform::getKind() const {
-    return false;
+s32 J3DAnmTransform::getKind() const {
+    return 0;
 }
 
 /* 8003C784-8003C800 0370C4 007C+00 1/0 0/0 0/0 .text            __dt__18mDoExt_transAnmBasFv */
diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp
index 464aa0073d..4bd32ed79e 100644
--- a/src/d/kankyo/d_kankyo.cpp
+++ b/src/d/kankyo/d_kankyo.cpp
@@ -63,19 +63,6 @@ struct JMath {
     static u8 sincosTable_[65536];
 };
 
-struct J3DTexMtxInfo {
-    /* 80325794 */ void setEffectMtx(f32 (*)[4]);
-};
-
-struct J3DMaterial {};
-
-struct J3DGXColor {};
-
-struct J3DColorBlock {
-    /* 801A4C08 */ void setLight(u32, J3DLightObj*);
-    /* 801A4C0C */ void setAmbColor(u32, J3DGXColor const*);
-};
-
 //
 // Forward References:
 //
@@ -403,7 +390,6 @@ extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
 extern "C" void memcmp();
 extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
-extern "C" extern u8 const j3dDefaultMtx[48];
 extern "C" extern void* __vt__12J3DFrameCtrl[3];
 extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */];
 extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp
index 2c64592c5f..a8c0ab5c2f 100644
--- a/src/d/particle/d_particle.cpp
+++ b/src/d/particle/d_particle.cpp
@@ -50,8 +50,6 @@ struct dPa_wbPcallBack_c {
 
 struct JPADrawInfo {};
 
-struct ResTIMG {};
-
 struct JPAResourceManager {
     /* 80273E10 */ JPAResourceManager(void const*, JKRHeap*);
     /* 80273EA8 */ void checkUserIndexDuplication(u16) const;
@@ -306,16 +304,6 @@ struct J3DUClipper {
     /* 802738FC */ void clip(f32 const (*)[4], Vec, f32) const;
 };
 
-struct J3DTexture {
-    /* 8031204C */ void loadGX(u16, _GXTexMapID) const;
-};
-
-struct J3DShape {
-    /* 80315300 */ void loadPreDrawSetting() const;
-
-    static u8 sOldVcdVatCmd[4];
-};
-
 //
 // Forward References:
 //
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index 7de112935e..8be4c29c98 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -143,10 +143,6 @@ struct cBgS {
     /* 80074744 */ void GetTriPla(cBgS_PolyInfo const&, cM3dGPla*) const;
 };
 
-struct J3DTexMtxInfo {
-    /* 80325794 */ void setEffectMtx(f32 (*)[4]);
-};
-
 //
 // Forward References:
 //
diff --git a/src/init.cpp b/src/init.cpp
index b135d31fb5..6a5b0d1a27 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -35,7 +35,6 @@ SECTION_INIT void __init_hardware();
 SECTION_INIT void __flush_cache();
 SECTION_INIT void memset();
 SECTION_INIT void __fill_mem();
-SECTION_INIT void memcpy();
 SECTION_INIT void TRK_memset();
 SECTION_INIT void TRK_memcpy();
 extern "C" extern u8 const __TRK_unknown_data[7988];
@@ -168,7 +167,7 @@ SECTION_INIT asm void __fill_mem() {
 #pragma push
 #pragma optimization_level 0
 #pragma optimizewithasm off
-SECTION_INIT asm void memcpy() {
+SECTION_INIT asm void* memcpy(void*, const void*, s32) {
     nofralloc
 #include "asm/init/memcpy.s"
 }
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index 49de92319f..c11c6f628a 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -4,6 +4,8 @@
 //
 
 #include "m_Do/m_Do_ext.h"
+#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
+#include "JSystem/J3DGraphBase/J3DTevs.h"
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRAssertHeap.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
@@ -40,8 +42,6 @@ struct mDoExt_btpAnm {
     /* 8000D5E8 */ void entry(J3DMaterialTable*, s16);
 };
 
-struct J3DAnmCluster {};
-
 struct mDoExt_blkAnm {
     /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16);
 };
@@ -61,8 +61,6 @@ struct mDoExt_MtxCalcAnmBlendTbl {
     /* 80014F3C */ ~mDoExt_MtxCalcAnmBlendTbl();
 };
 
-struct J3DTransformInfo {};
-
 struct mDoExt_McaMorfCallBack2_c {};
 
 struct Z2Creature {
@@ -135,10 +133,6 @@ struct mDoExt_3DlineMatSortPacket {
     /* 80014E20 */ ~mDoExt_3DlineMatSortPacket();
 };
 
-struct ResTIMG {};
-
-struct _GXColor {};
-
 struct dKy_tevstr_c {};
 
 struct mDoExt_3DlineMat1_c {
@@ -160,10 +154,6 @@ struct mDoExt_3DlineMat0_c {
 };
 
 struct J3DDrawBuffer;
-struct J3DPacket {
-    /* 8000E680 */ ~J3DPacket();
-    /* 80312750 */ bool entry(J3DDrawBuffer*);
-};
 
 struct J3DDrawBuffer {
     /* 8032548C */ void entryImm(J3DPacket*, u16);
@@ -173,14 +163,8 @@ struct dDlst_list_c {
     /* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&);
 };
 
-struct _GXLogicOp {};
-
 struct _GXCompare {};
 
-struct _GXBlendMode {};
-
-struct _GXBlendFactor {};
-
 struct JAISoundID {};
 
 struct Z2SoundHandlePool {};
@@ -210,10 +194,6 @@ struct JUTResFont {
     /* 802DEF94 */ JUTResFont(ResFONT const*, JKRHeap*);
 };
 
-struct JUTNameTab {
-    /* 802DEAF8 */ void getName(u16) const;
-};
-
 struct JUTFont {
     /* 8001494C */ ~JUTFont();
     /* 80014D9C */ void setGX(JUtility::TColor, JUtility::TColor);
@@ -225,116 +205,6 @@ struct JUTCacheFont {
     /* 802DD188 */ JUTCacheFont(ResFONT const*, u32, JKRHeap*);
 };
 
-struct J3DZMode {};
-
-struct J3DVertexBuffer {
-    /* 80310FD8 */ void init();
-};
-
-struct J3DTexMtxAnm {};
-
-struct J3DTexCoord {
-    /* 8000E464 */ J3DTexCoord();
-};
-
-struct J3DTexGenBlock {
-    /* 8000DFD8 */ bool getTexMtx(u32);
-    /* 8000DFE0 */ bool getTexCoord(u32);
-    /* 8000DFE8 */ bool getTexGenNum() const;
-    /* 8000E0CC */ void setTexCoord(u32, J3DTexCoord const*);
-    /* 8000E0D0 */ void setTexGenNum(u32);
-};
-
-struct J3DTevSwapModeTable {
-    /* 8000E134 */ J3DTevSwapModeTable();
-};
-
-struct J3DTevStageInfo {};
-
-struct J3DTevStage {
-    /* 8000E230 */ J3DTevStage();
-    /* 8000E298 */ void setTevStageInfo(J3DTevStageInfo const&);
-};
-
-struct J3DTevOrder {
-    /* 8000E140 */ J3DTevOrder();
-};
-
-struct J3DTevKColorAnm {};
-
-struct J3DTevColorAnm {};
-
-struct J3DGXColorS10 {
-    /* 8000E460 */ J3DGXColorS10();
-};
-
-struct J3DIndTevStage {
-    /* 8000E14C */ J3DIndTevStage();
-};
-
-struct J3DGXColor {
-    /* 8000E538 */ J3DGXColor();
-};
-
-struct J3DTevBlock {
-    /* 8000DBC8 */ void patchTexNoAndTexCoordScale();
-    /* 8000DBD4 */ void patch();
-    /* 8000DF84 */ bool getIndTevStage(u32);
-    /* 8000DF8C */ bool getTevStage(u32);
-    /* 8000DF94 */ void getTexNo(u32) const;
-    /* 8000DFA0 */ bool getTevSwapModeTable(u32);
-    /* 8000DFA8 */ bool getTevKAlphaSel(u32);
-    /* 8000DFB0 */ bool getTevKColorSel(u32);
-    /* 8000DFB8 */ bool getTevOrder(u32);
-    /* 8000DFC0 */ bool getTevKColor(u32);
-    /* 8000DFC8 */ bool getTevColor(u32);
-    /* 8000DFD0 */ bool getTevStageNum() const;
-    /* 8000E0A4 */ void setIndTevStage(u32, J3DIndTevStage);
-    /* 8000E0A8 */ void setTevStage(u32, J3DTevStage);
-    /* 8000E0AC */ void setTexNo(u32, u16);
-    /* 8000E0B0 */ void setTevSwapModeTable(u32, J3DTevSwapModeTable);
-    /* 8000E0B4 */ void setTevKAlphaSel(u32, u8);
-    /* 8000E0B8 */ void setTevKColorSel(u32, u8);
-    /* 8000E0BC */ void setTevOrder(u32, J3DTevOrder);
-    /* 8000E0C0 */ void setTevKColor(u32, J3DGXColor);
-    /* 8000E0C4 */ void setTevColor(u32, J3DGXColorS10);
-    /* 8000E0C8 */ void setTevStageNum(u8);
-};
-
-struct J3DSys {
-    /* 8031073C */ void reinitGX();
-
-    static u8 mCurrentMtx[48];
-    static f32 mParentS[3];
-};
-
-struct J3DShapePacket {
-    /* 80312FBC */ void drawFast();
-};
-
-struct J3DShape {
-    /* 80315300 */ void loadPreDrawSetting() const;
-
-    static u8 sOldVcdVatCmd[4];
-};
-
-struct J3DAlphaComp {};
-
-struct J3DBlend {};
-
-struct J3DPEBlock {
-    /* 8000DBCC */ void patch();
-    /* 8000DF3C */ bool getZCompLoc() const;
-    /* 8000DF44 */ bool getZMode();
-    /* 8000DF4C */ bool getBlend();
-    /* 8000DF54 */ bool getAlphaComp();
-    /* 8000DF5C */ bool getFog();
-    /* 8000E010 */ void setZCompLoc(u8);
-    /* 8000E014 */ void setZMode(J3DZMode);
-    /* 8000E018 */ void setBlend(J3DBlend const&);
-    /* 8000E01C */ void setAlphaComp(J3DAlphaComp const&);
-};
-
 struct J3DMtxCalcNoAnmBase {
     /* 8000FA8C */ ~J3DMtxCalcNoAnmBase();
 };
@@ -348,14 +218,6 @@ struct J3DMtxCalcNoAnm__template0 {
     /* 80015084 */ void func_80015084(void* _this);
 };
 
-struct J3DMtxCalcJ3DSysInitMaya {
-    /* 8032ECAC */ void init(Vec const&, f32 const (&)[3][4]);
-};
-
-struct J3DMtxCalcCalcTransformMaya {
-    /* 8032EFBC */ void calcTransform(J3DTransformInfo const&);
-};
-
 struct J3DMtxCalcAnmBase {
     /* 8000D8EC */ ~J3DMtxCalcAnmBase();
     /* 80014FB8 */ void getAnmTransform();
@@ -373,74 +235,10 @@ struct J3DMtxCalcAnimation__template0 {
     /* 800150AC */ void func_800150AC(void* _this);
 };
 
-struct J3DMtxCalc {
-    /* 8000D948 */ ~J3DMtxCalc();
-    /* 80014E8C */ void setAnmTransform(u8, J3DAnmTransform*);
-    /* 80014E90 */ void setAnmTransform(J3DAnmTransform*);
-    /* 80014E94 */ bool getAnmTransform(u8);
-    /* 80014E9C */ bool getAnmTransform();
-    /* 80014EA4 */ void setWeight(u8, f32);
-    /* 80014EA8 */ void getWeight(u8) const;
-
-    static u8 mJoint[4];
-};
-
-struct J3DMaterialAnm {
-    /* 8032C5E4 */ void setTexMtxAnm(int, J3DTexMtxAnm*);
-    /* 8032C664 */ void setTevColorAnm(int, J3DTevColorAnm*);
-    /* 8032C6A4 */ void setTevKColorAnm(int, J3DTevKColorAnm*);
-};
-
-struct J3DIndTexOrder {
-    /* 8000E128 */ J3DIndTexOrder();
-};
-
 struct J3DIndTexMtxInfo {
     /* 803257DC */ void operator=(J3DIndTexMtxInfo const&);
 };
 
-struct J3DIndTexMtx {
-    /* 8000E064 */ ~J3DIndTexMtx();
-    /* 8000E0F0 */ J3DIndTexMtx();
-};
-
-struct J3DIndTexCoordScale {
-    /* 8000E024 */ ~J3DIndTexCoordScale();
-    /* 8000E0E4 */ J3DIndTexCoordScale();
-};
-
-struct J3DIndBlock {
-    /* 8000DF64 */ bool getIndTexCoordScale(u32);
-    /* 8000DF6C */ bool getIndTexMtx(u32);
-    /* 8000DF74 */ bool getIndTexOrder(u32);
-    /* 8000DF7C */ bool getIndTexStageNum() const;
-    /* 8000E020 */ void setIndTexCoordScale(u32, J3DIndTexCoordScale);
-    /* 8000E060 */ void setIndTexMtx(u32, J3DIndTexMtx);
-    /* 8000E0A0 */ void setIndTexStageNum(u8);
-};
-
-struct J3DDisplayListObj {
-    /* 80312618 */ void callDL() const;
-
-    static u8 sGDLObj[16];
-};
-
-struct J3DColorChan {
-    /* 8000E47C */ J3DColorChan();
-};
-
-struct J3DColorBlock {
-    /* 8000DBD0 */ void patchLight();
-    /* 8000DFF0 */ bool getAmbColor(u32);
-    /* 8000DFF8 */ bool getColorChan(u32);
-    /* 8000E000 */ bool getMatColor(u32);
-    /* 8000E008 */ bool getColorChanNum() const;
-    /* 8000E0D4 */ void setAmbColor(u32, J3DGXColor);
-    /* 8000E0D8 */ void setColorChan(u32, J3DColorChan const&);
-    /* 8000E0DC */ void setMatColor(u32, J3DGXColor);
-    /* 8000E0E0 */ void setColorChanNum(u8);
-};
-
 //
 // Forward References:
 //
@@ -760,23 +558,14 @@ extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey();
 extern "C" void JMAEulerToQuat__FsssP10Quaternion();
 extern "C" void JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion();
 extern "C" void DCStoreRangeNoSync();
-extern "C" void GXSetVtxDesc();
 extern "C" void GXClearVtxDesc();
-extern "C" void GXSetVtxAttrFmt();
 extern "C" void GXSetArray();
-extern "C" void GXBegin();
-extern "C" void GXInitTexObj();
-extern "C" void GXInitTexObjLOD();
 extern "C" void GXGetTexObjWidth();
 extern "C" void GXGetTexObjHeight();
-extern "C" void GXLoadTexObj();
 extern "C" void GXSetTexCoordScaleManually();
 extern "C" void GXSetNumIndStages();
-extern "C" void GXSetTevColor();
-extern "C" void GXCallDisplayList();
 extern "C" void GXLoadPosMtxImm();
 extern "C" void GXLoadNrmMtxImm();
-extern "C" void GDInitGDLObj();
 extern "C" void __construct_new_array();
 extern "C" void _savegpr_15();
 extern "C" void _savegpr_18();
@@ -808,7 +597,6 @@ extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */];
 extern "C" extern void* __vt__9J3DPacket[5];
 extern "C" extern void* __vt__8J3DModel[9];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
-extern "C" extern u8 j3dSys[284];
 extern "C" u8 mCurrentMtx__6J3DSys[48];
 extern "C" f32 mParentS__6J3DSys[3];
 extern "C" u8 sGDLObj__17J3DDisplayListObj[16];
@@ -817,7 +605,6 @@ extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */];
 extern "C" u8 sCurrentHeap__7JKRHeap[4];
 extern "C" u8 sOldVcdVatCmd__8J3DShape[4];
 extern "C" u8 mJoint__10J3DMtxCalc[4];
-extern "C" extern u8 __GDCurrentDL[4];
 extern "C" extern u32 j3dDefaultTevOrderInfoNull;
 extern "C" extern u32 j3dDefaultIndTexOrderNull;
 extern "C" extern u8 j3dDefaultIndTexCoordScaleInfo[4];
@@ -1973,23 +1760,23 @@ bool J3DTevBlock::getTevOrder(u32 param_0) {
 }
 
 /* 8000DFC0-8000DFC8 008900 0008+00 0/0 3/0 0/0 .text            getTevKColor__11J3DTevBlockFUl */
-bool J3DTevBlock::getTevKColor(u32 param_0) {
-    return false;
+GXColor* J3DTevBlock::getTevKColor(u32 param_0) {
+    return NULL;
 }
 
 /* 8000DFC8-8000DFD0 008908 0008+00 0/0 3/0 0/0 .text            getTevColor__11J3DTevBlockFUl */
-bool J3DTevBlock::getTevColor(u32 param_0) {
-    return false;
+GXColorS10* J3DTevBlock::getTevColor(u32 param_0) {
+    return NULL;
 }
 
 /* 8000DFD0-8000DFD8 008910 0008+00 0/0 2/0 0/0 .text            getTevStageNum__11J3DTevBlockCFv */
-bool J3DTevBlock::getTevStageNum() const {
-    return true;
+u8 J3DTevBlock::getTevStageNum() const {
+    return 1;
 }
 
 /* 8000DFD8-8000DFE0 008918 0008+00 0/0 2/0 0/0 .text            getTexMtx__14J3DTexGenBlockFUl */
-bool J3DTexGenBlock::getTexMtx(u32 param_0) {
-    return false;
+J3DTexMtx* J3DTexGenBlock::getTexMtx(u32 param_0) {
+    return NULL;
 }
 
 /* 8000DFE0-8000DFE8 008920 0008+00 0/0 2/0 0/0 .text            getTexCoord__14J3DTexGenBlockFUl */
@@ -2014,8 +1801,8 @@ bool J3DColorBlock::getColorChan(u32 param_0) {
 }
 
 /* 8000E000-8000E008 008940 0008+00 0/0 2/0 0/0 .text            getMatColor__13J3DColorBlockFUl */
-bool J3DColorBlock::getMatColor(u32 param_0) {
-    return false;
+GXColor* J3DColorBlock::getMatColor(u32 param_0) {
+    return NULL;
 }
 
 /* 8000E008-8000E010 008948 0008+00 0/0 2/0 0/0 .text            getColorChanNum__13J3DColorBlockCFv