Misc debug include/class order improvements + link remaining Z2AudioLib TUs (#3014)

* Improve dolzel.pch ordering

* Improve JSystem include order

* Various class ordering fixes

* Link remaining Z2AudioLib TUs

* Fix some symbols in Shield and weak functions in ShieldD

2 files changed, 69 insertions, 34 deletions

diff --git a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h
index cb70bbffa2..ad5afe3245 100644
--- a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h
+++ b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h
@@ -1,7 +1,30 @@
 #ifndef J3DANMLOADER_H
 #define J3DANMLOADER_H
 
-#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
+class J3DAnmClusterFull;
+struct J3DAnmClusterFullData;
+class J3DAnmClusterKey;
+struct J3DAnmClusterKeyData;
+class J3DAnmColorFull;
+struct J3DAnmColorFullData;
+class J3DAnmColorKey;
+struct J3DAnmColorKeyData;
+class J3DAnmTevRegKey;
+struct J3DAnmTevRegKeyData;
+class J3DAnmTexPattern;
+struct J3DAnmTexPatternFullData;
+class J3DAnmTextureSRTKey;
+struct J3DAnmTextureSRTKeyData;
+class J3DAnmTransformFull;
+struct J3DAnmTransformFullData;
+class J3DAnmTransformKey;
+struct J3DAnmTransformKeyData;
+class J3DAnmVisibilityFull;
+struct J3DAnmVisibilityFullData;
+class J3DAnmVtxColorFull;
+struct J3DAnmVtxColorFullData;
+class J3DAnmVtxColorKey;
+struct J3DAnmVtxColorKeyData;
 
 enum J3DAnmLoaderDataBaseFlag {
     J3DLOADER_UNK_FLAG0,
@@ -28,29 +51,6 @@ public:
     virtual ~J3DAnmLoader() {}
 };
 
-class J3DAnmKeyLoader_v15 : public J3DAnmLoader {
-public:
-    J3DAnmKeyLoader_v15();
-    void readAnmTransform(J3DAnmTransformKeyData const*);
-    void setAnmTransform(J3DAnmTransformKey*, J3DAnmTransformKeyData const*);
-    void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
-    void setAnmTextureSRT(J3DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
-    void readAnmColor(J3DAnmColorKeyData const*);
-    void setAnmColor(J3DAnmColorKey*, J3DAnmColorKeyData const*);
-    void readAnmCluster(J3DAnmClusterKeyData const*);
-    void setAnmCluster(J3DAnmClusterKey*, J3DAnmClusterKeyData const*);
-    void readAnmTevReg(J3DAnmTevRegKeyData const*);
-    void setAnmTevReg(J3DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
-    void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
-    void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
-
-    virtual J3DAnmBase* load(void const*);
-    virtual void setResource(J3DAnmBase*, void const*);
-    virtual ~J3DAnmKeyLoader_v15();
-
-    /* 0x4 */ J3DAnmBase* mAnm;
-};
-
 class J3DAnmFullLoader_v15 : public J3DAnmLoader {
 public:
     J3DAnmFullLoader_v15();
@@ -74,4 +74,27 @@ public:
     /* 0x4 */ J3DAnmBase* mAnm;
 };
 
+class J3DAnmKeyLoader_v15 : public J3DAnmLoader {
+public:
+    J3DAnmKeyLoader_v15();
+    void readAnmTransform(J3DAnmTransformKeyData const*);
+    void setAnmTransform(J3DAnmTransformKey*, J3DAnmTransformKeyData const*);
+    void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
+    void setAnmTextureSRT(J3DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
+    void readAnmColor(J3DAnmColorKeyData const*);
+    void setAnmColor(J3DAnmColorKey*, J3DAnmColorKeyData const*);
+    void readAnmCluster(J3DAnmClusterKeyData const*);
+    void setAnmCluster(J3DAnmClusterKey*, J3DAnmClusterKeyData const*);
+    void readAnmTevReg(J3DAnmTevRegKeyData const*);
+    void setAnmTevReg(J3DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
+    void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
+    void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
+
+    virtual J3DAnmBase* load(void const*);
+    virtual void setResource(J3DAnmBase*, void const*);
+    virtual ~J3DAnmKeyLoader_v15();
+
+    /* 0x4 */ J3DAnmBase* mAnm;
+};
+
 #endif /* J3DANMLOADER_H */
diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/include/JSystem/J3DGraphLoader/J3DModelLoader.h
index a0a9709002..59912caf1a 100644
--- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h
+++ b/include/JSystem/J3DGraphLoader/J3DModelLoader.h
@@ -1,6 +1,7 @@
 #ifndef J3DMODELLOADER_H
 #define J3DMODELLOADER_H
 
+#include "JSystem/J3DGraphBase/J3DSys.h"
 #include "dolphin/mtx.h"
 
 class J3DModelData;
@@ -305,6 +306,19 @@ public:
  * @ingroup jsystem-j3d
  * 
  */
+class J3DModelLoader_v26 : public J3DModelLoader {
+public:
+    ~J3DModelLoader_v26() {}
+    void readMaterial(J3DMaterialBlock const*, u32);
+    void readMaterialTable(J3DMaterialBlock const*, u32);
+    u32 calcSizeMaterial(J3DMaterialBlock const*, u32);
+    u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32);
+};
+
+/**
+ * @ingroup jsystem-j3d
+ *
+ */
 class J3DModelLoader_v21 : public J3DModelLoader {
 public:
     ~J3DModelLoader_v21() {}
@@ -316,22 +330,20 @@ public:
  * @ingroup jsystem-j3d
  * 
  */
-class J3DModelLoader_v26 : public J3DModelLoader {
+class J3DModelLoaderDataBase {
 public:
-    ~J3DModelLoader_v26() {}
-    void readMaterial(J3DMaterialBlock const*, u32);
-    void readMaterialTable(J3DMaterialBlock const*, u32);
-    u32 calcSizeMaterial(J3DMaterialBlock const*, u32);
-    u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32);
+    static J3DModelData* load(void const* i_data, u32 i_flags);
 };
 
 /**
  * @ingroup jsystem-j3d
- * 
+ *
  */
-class J3DModelLoaderDataBase {
-public:
-    static J3DModelData* load(void const* i_data, u32 i_flags);
+struct J3DMtxCalcJ3DSysInitSoftimage {
+    static void init(const Vec& param_0, const Mtx& param_1) {
+        J3DSys::mCurrentS = param_0;
+        MTXCopy(param_1, J3DSys::mCurrentMtx);
+    }
 };
 
 #endif /* J3DMODELLOADER_H */