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

src/JSystem/J3DGraphAnimator/J3DJointTree.cpp

@@ -1,5 +1,6 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
+#include "JSystem/J3DGraphAnimator/J3DJoint.h"
 #include "JSystem/J3DGraphAnimator/J3DJointTree.h"
 #include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h"
 #include "JSystem/J3DGraphAnimator/J3DShapeTable.h"

src/JSystem/J3DGraphAnimator/J3DModel.cpp

@@ -1,9 +1,11 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
+#include "JSystem/J3DGraphAnimator/J3DShapeTable.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphBase/J3DShapeMtx.h"
+#include "JSystem/J3DGraphBase/J3DSys.h"
 
 #define J3D_ASSERTMSG(LINE, COND, MSG) JUT_ASSERT_MSG(LINE, (COND) != 0, MSG)
 #define J3D_WARN1(LINE, MSG, ARG1) JUT_WARN(LINE, MSG, ARG1)

src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp

@@ -1,5 +1,6 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
+#include "JSystem/J3DGraphAnimator/J3DJoint.h"
 #include "JSystem/J3DGraphAnimator/J3DMtxBuffer.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphLoader/J3DModelLoader.h"

src/JSystem/J3DGraphAnimator/J3DShapeTable.cpp

@@ -1,6 +1,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphAnimator/J3DShapeTable.h"
+#include "JSystem/J3DGraphBase/J3DShape.h"
 
 void J3DShapeTable::hide() {
     u16 shapeNum = mShapeNum;

src/JSystem/J3DGraphBase/J3DShapeMtx.cpp

@@ -4,6 +4,7 @@
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/J3DGraphBase/J3DFifo.h"
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
+#include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DTexture.h"
 
 u16 J3DShapeMtx::sMtxLoadCache[10];

src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp

@@ -5,6 +5,7 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
+#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 #include "JSystem/JSupport/JSupport.h"
 #include "dolphin/os.h"
 

src/JSystem/J3DGraphLoader/J3DModelLoader.cpp

@@ -1,5 +1,8 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
+#include "JSystem/J3DGraphAnimator/J3DShapeTable.h"
+#include "JSystem/J3DGraphAnimator/J3DJointTree.h"
+#include "JSystem/J3DGraphAnimator/J3DJoint.h"
 #include "JSystem/J3DGraphLoader/J3DModelLoader.h"
 #include "JSystem/J3DGraphLoader/J3DJointFactory.h"
 #include "JSystem/J3DGraphLoader/J3DMaterialFactory.h"
@@ -10,7 +13,6 @@
 #include "JSystem/JUtility/JUTNameTab.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JSupport/JSupport.h"
-#include "dolphin/os.h"
 
 J3DModelLoader::J3DModelLoader() :
                 mpModelData(NULL),

src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp

@@ -5,12 +5,12 @@
 #include "JSystem/J3DGraphLoader/J3DShapeFactory.h"
 #include "JSystem/J3DGraphLoader/J3DMaterialFactory.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
+#include "JSystem/J3DGraphAnimator/J3DJoint.h"
 #include "JSystem/J3DGraphAnimator/J3DModelData.h"
 #include "JSystem/JSupport/JSupport.h"
 #include "dolphin/os.h"
 #include "global.h"
 
-
 u16 J3DModelLoader::countMaterialNum(const void* stream) {
     const J3DModelFileData* header = (const J3DModelFileData*)stream;
     const J3DModelBlock* block = header->mBlocks;

src/JSystem/JAudio2/JAUAudioMgr.cpp

@@ -11,6 +11,10 @@
 // Here to generate JASHeap::__defctor (ctor generated by default arguments)
 void dummyDefCtor() {
     JASHeap dummy[20];
+    //TODO: ShieldD needs the weak functions this pulls in, but in retail it breaks weak function
+    //      placement
+#if VERSION == VERSION_SHIELD_DEBUG
     JAUStreamStaticAramMgr_<1>* streamStaticAramMgr = new(NULL, 0) JAUStreamStaticAramMgr_<1>();
     streamStaticAramMgr->reserveAram(NULL, 0, 0x14);
+#endif
 }

src/Z2AudioLib/Z2AudioMgr.cpp

@@ -1,3 +1,5 @@
+#include "d/dolzel.h" // IWYU pragma: keep
+
 #include "Z2AudioLib/Z2AudioMgr.h"
 #include "JSystem/JAudio2/JASAiCtrl.h"
 #include "JSystem/JAudio2/JASDriverIF.h"

src/Z2AudioLib/Z2SceneMgr.cpp

@@ -1,3 +1,5 @@
+#include "d/dolzel.h" // IWYU pragma: keep
+
 #include "JSystem/JAudio2/JASBasicWaveBank.h"
 #include "JSystem/JAudio2/JAUSectionHeap.h"
 #include "JSystem/JAudio2/JAUSoundTable.h"

src/d/actor/d_a_npc_bouS.cpp

@@ -953,6 +953,23 @@ void daNpcBouS_c::lookat() {
     mLookat.calc(this, mdl_p->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE);
 }
 
+BOOL daNpcBouS_c::chkFindPlayer() {
+    BOOL inArea = FALSE;
+    if (mActorMngrs[0].getActorP() == NULL) {
+        inArea = chkPlayerInSpeakArea(this);
+    } else {
+        inArea = chkPlayerInTalkArea(this);
+    }
+
+    if (inArea) {
+        mActorMngrs[0].entry(daPy_getPlayerActorClass());
+    } else {
+        mActorMngrs[0].remove();
+    }
+
+    return inArea;
+}
+
 BOOL daNpcBouS_c::step(s16 i_turnTargetAngle, int param_2) {
     if (mTurnMode == 0) {
         if (param_2 != 0) {
@@ -1594,7 +1611,7 @@ int daNpcBouS_c::drawDbgInfo() {
     return 0;
 }
 
-void daNpcBouS_c::drawOtherMdls() {}
+inline void daNpcBouS_c::drawOtherMdls() {}
 
 AUDIO_INSTANCES;
 

src/d/actor/d_a_obj_prop.cpp

@@ -20,9 +20,8 @@ daObjProp_c::~daObjProp_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-static const u32 BMD_IDX[] = {3, 4};
-
 bool daObjProp_c::createHeap() {
+    static const u32 BMD_IDX[] = {3, 4};
     u32 nameArg = getNameArg_0();
     u32 bmd = BMD_IDX[nameArg];
     mpModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName, bmd), 0x80000,
@@ -60,9 +59,8 @@ int daObjProp_c::draw() {
     return 1;
 }
 
-static const s16 ADD_ANGLE[] = {0x1800, -0x1800};
-
 int daObjProp_c::execute() {
+    static const s16 ADD_ANGLE[] = {0x1800, -0x1800};
     shape_angle.y += ADD_ANGLE[mArg];
     setModelMtx();
     return 1;