d_a_alink debug improvements (#3112)

include/d/actor/d_a_player.h

@@ -7,6 +7,29 @@
 
 struct ResTIMG;
 
+class daPy_frameCtrl_c : public J3DFrameCtrl {
+public:
+    virtual ~daPy_frameCtrl_c() {}
+    daPy_frameCtrl_c() {}
+    bool checkAnmEnd();
+    void updateFrame();
+    void setFrameCtrl(u8 i_attribute, s16 i_start, s16 i_end, f32 i_rate, f32 i_frame);
+
+    u16 getEndFlg() const { return mEndFlg; }
+    u16 getNowSetFlg() const { return mNowSetFlg; }
+    void onEndFlg() { mEndFlg = 1; }
+    void onNowSetFlg() { mNowSetFlg = 1; }
+    void offNowSetFlg() { mNowSetFlg = 0; }
+    void offEndFlg() {
+        mEndFlg = 0;
+        mNowSetFlg = 0;
+    }
+
+private:
+    /* 0x14 */ u16 mEndFlg;
+    /* 0x16 */ u16 mNowSetFlg;
+};
+
 class daPy_sightPacket_c : public dDlst_base_c {
 public:
     daPy_sightPacket_c() {}
@@ -111,29 +134,6 @@ private:
     /* 0x4 */ fopAc_ac_c* mActor;
 };  // Size: 0x8
 
-class daPy_frameCtrl_c : public J3DFrameCtrl {
-public:
-    virtual ~daPy_frameCtrl_c() {}
-    daPy_frameCtrl_c() {}
-    bool checkAnmEnd();
-    void updateFrame();
-    void setFrameCtrl(u8 i_attribute, s16 i_start, s16 i_end, f32 i_rate, f32 i_frame);
-
-    u16 getEndFlg() const { return mEndFlg; }
-    u16 getNowSetFlg() const { return mNowSetFlg; }
-    void onEndFlg() { mEndFlg = 1; }
-    void onNowSetFlg() { mNowSetFlg = 1; }
-    void offNowSetFlg() { mNowSetFlg = 0; }
-    void offEndFlg() {
-        mEndFlg = 0;
-        mNowSetFlg = 0;
-    }
-
-private:
-    /* 0x14 */ u16 mEndFlg;
-    /* 0x16 */ u16 mNowSetFlg;
-};
-
 class Z2WolfHowlMgr;
 class daBoomerang_c;
 

include/d/d_bg_s_acch.h

@@ -239,13 +239,6 @@ private:
     /* 0x1D4 */ u8 m_wtr_mode;
 }; // Size: 0x1D8
 
-class dBgS_LinkAcch : public dBgS_Acch {
-public:
-    dBgS_LinkAcch() { SetLink(); }
-
-    virtual ~dBgS_LinkAcch() {}
-};
-
 class dBgS_ObjAcch : public dBgS_Acch {
 public:
     dBgS_ObjAcch() {
@@ -255,6 +248,13 @@ public:
     virtual ~dBgS_ObjAcch() {}
 }; // Size: 0x1D8
 
+class dBgS_LinkAcch : public dBgS_Acch {
+public:
+    dBgS_LinkAcch() { SetLink(); }
+
+    virtual ~dBgS_LinkAcch() {}
+};
+
 STATIC_ASSERT(sizeof(dBgS_ObjAcch) == 0x1D8);
 
 class dBgS_StatueAcch : public dBgS_Acch {

include/d/d_jnt_col.h

@@ -2,6 +2,7 @@
 #define D_D_JNT_COL_H
 
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
+#include "JSystem/JHostIO/JORReflexible.h"
 #include "SSystem/SComponent/c_m3d_g_lin.h"
 #include "SSystem/SComponent/c_sxyz.h"
 
@@ -33,7 +34,7 @@ public:
     bool checkShieldType(int i) { return getType(i) == 3; }
 
     s8 getType(int i) { return mData[i].mType; }
-    int getJntNum(int i) { return mData[i].mJntNum; }
+    int getJntNum(int i) { return (s16)mData[i].mJntNum; }
 
     /* 0x00 */ const dJntColData_c* mData;
     /* 0x04 */ J3DModel* mModel;

include/d/d_particle.h

@@ -6,7 +6,7 @@
 #include "JSystem/JParticle/JPAEmitter.h"
 #include "JSystem/JParticle/JPAParticle.h"
 #include "d/d_particle_name.h"
-#include "d/d_kankyo.h"
+#include "d/d_kankyo_tev_str.h"
 
 void dPa_cleanupGX();
 

include/d/dolzel_base.pch

@@ -4,26 +4,28 @@
 // Fixes weak .bss
 #include "weak_bss_1109_to_1009.h" // IWYU pragma: export
 
-// Fixes weak .data
-#include <cmath> // IWYU pragma: export
-#include <limits> // IWYU pragma: export
-#include "JSystem/J3DGraphBase/J3DMatBlock.h" // IWYU pragma: export
-#include "Z2AudioLib/Z2Calc.h" // IWYU pragma: export
-
-// Fixes weak function/RTTI ordering
 #include <cmath> // IWYU pragma: export
 #include <cstring> // IWYU pragma: export
+// Provides float constants from sqrt implementation
+#include <cmath> // IWYU pragma: export
+// Provides signaling NaN constants
+#include <limits> // IWYU pragma: export
 #include "Z2AudioLib/Z2AudioArcLoader.h" // IWYU pragma: export
 #include "JSystem/JAudio2/JAUStreamAramMgr.h" // IWYU pragma: export
 #include "JSystem/JKernel/JKRDisposer.h" // IWYU pragma: export
 #include "JSystem/JGadget/linklist.h" // IWYU pragma: export
+#include "JSystem/JUtility/JUTGamePad.h" // IWYU pragma: export
+// Provides AttnArr (u8 array)
+#include "JSystem/J3DGraphBase/J3DMatBlock.h" // IWYU pragma: export
+// Provides Z2Calc::cNullVec
+#include "Z2AudioLib/Z2Calc.h" // IWYU pragma: export
+#include "JSystem/J3DGraphBase/J3DTexture.h" // IWYU pragma: export
 #include "JSystem/J3DGraphBase/J3DPacket.h" // IWYU pragma: export
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h" // IWYU pragma: export
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export
-#include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" // IWYU pragma: export
 #include "JSystem/J3DGraphAnimator/J3DShapeTable.h" // IWYU pragma: export
 #include "JSystem/J3DGraphAnimator/J3DJoint.h" // IWYU pragma: export
-#include "JSystem/JUtility/JUTGamePad.h" // IWYU pragma: export
+#include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" // IWYU pragma: export
 #include "JSystem/J3DGraphBase/J3DSys.h" // IWYU pragma: export
 #include "JSystem/JHostIO/JHICommonMem.h" // IWYU pragma: export
 #include "JSystem/JHostIO/JORReflexible.h" // IWYU pragma: export
@@ -36,7 +38,10 @@
 #include "SSystem/SComponent/c_m3d_g_cyl.h" // IWYU pragma: export
 #include "m_Do/m_Do_hostIO.h" // IWYU pragma: export
 #include "f_op/f_op_actor.h" // IWYU pragma: export
+#include "JSystem/JParticle/JPAEmitter.h" // IWYU pragma: export
+#include "JSystem/JParticle/JPAParticle.h" // IWYU pragma: export
 #include "d/d_bg_s_gnd_chk.h" // IWYU pragma: export
+#include "d/d_particle.h" // IWYU pragma: export
 #include "d/d_bg_s_chk.h" // IWYU pragma: export
 #include "d/d_bg_w.h" // IWYU pragma: export
 #include "d/d_drawlist.h" // IWYU pragma: export