Work on d_msg_scrn_howl + misc (#2040)

4 files changed, 23 insertions, 1 deletions

diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h
index f3ef092aea..08d73420da 100644
--- a/include/d/a/d_a_alink.h
+++ b/include/d/a/d_a_alink.h
@@ -3367,6 +3367,12 @@ public:
     bool checkRootTransZClearMode() { return field_0x2f99 & 4; }
     bool checkRootTransXClearMode() { return field_0x2f99 & 1; }
     bool checkRootTransYClearMode() { return field_0x2f99 & 2; }
+    s16 checkWindStoneHowl() {return mProcVar3.field_0x300e.y; }
+    u8 getCorrectCurveID() { return mZ2WolfHowlMgr.getCorrectCurveID(); }
+    u8 getCorrectLineNum() { return mZ2WolfHowlMgr.getCorrectLineNum(); }
+    u32 getWolfHowlTimer() { return mZ2WolfHowlMgr.getTimer(); }
+    s8 getOnLineNum() { return mZ2WolfHowlMgr.getOnLineNum(); }
+    SongNote getCorrectLine(u8 param_0) { return mZ2WolfHowlMgr.getCorrectLine(param_0); }
 
     inline bool checkWindSpeedOnXZ() const;
     inline void startRestartRoomFromOut(int, u32, int);
diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h
index a075055164..5be233aa32 100644
--- a/include/d/d_drawlist.h
+++ b/include/d/d_drawlist.h
@@ -178,9 +178,13 @@ public:
     /* 800562D0 */ dDlst_shadowReal_c() { mState = 0; }
 
     dDlst_shadowReal_c* getZsortNext() { return mZsortNext; }
+    dDlst_shadowReal_c* getZsortPre() { return mZsortPre; }
     bool isNoUse() { return mState == 0; }
     bool isUse() { return mState == 1; }
     bool checkKey(u32 i_key) { return mKey == i_key; }
+    f32 getCameraZ() { return mCameraZ; }
+    void setZsortNext(dDlst_shadowReal_c* next) { mZsortNext = next; }
+    void setZsortPre(dDlst_shadowReal_c* pre) { mZsortPre = pre; }
 
 private:
     /* 0x0000 */ u8 mState;
diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h
index 69a043805a..f10e134d59 100644
--- a/include/d/msg/d_msg_object.h
+++ b/include/d/msg/d_msg_object.h
@@ -440,7 +440,7 @@ public:
     /* 0xA8 */ f32 mLineSpaceOffset;
     /* 0xAC */ u16 mWaveformThickness;
     /* 0xAE */ u16 mWaveformLineLen;
-    /* 0xB0 */ u16 mWaveformDotLen;
+    /* 0xB0 */ s16 mWaveformDotLen;
 };
 
 class dMsgObject_HIO_c {
diff --git a/include/d/pane/d_pane_class.h b/include/d/pane/d_pane_class.h
index 87fa3c194b..7599f3e42c 100644
--- a/include/d/pane/d_pane_class.h
+++ b/include/d/pane/d_pane_class.h
@@ -33,10 +33,22 @@ public:
     /* 80254EBC */ Vec getGlobalVtxCenter(J2DPane*, bool, s16);
     /* 80254FB8 */ JGeometry::TBox2<f32>* getBounds(J2DPane*);
 
+    Vec getGlobalVtx(Mtx* param_0, u8 param_1, bool param_2, s16 param_3) {
+        return getGlobalVtx(getPanePtr(), param_0, param_1, param_2, param_3);
+    }
+
     Vec getGlobalVtxCenter(bool param_0, s16 param_1) {
         return getGlobalVtxCenter(getPanePtr(), param_0, param_1);
     }
 
+    f32 getGlobalCenterPosY() {
+        return getGlobalPosY() + mPane->getHeight() / 2;
+    }
+
+    f32 getCenterPosX() {
+        return mPane->getBounds().i.x + mPane->getWidth() / 2;
+    }
+
     void translate(f32 x, f32 y) { getPanePtr()->translate(x, y); }
     void scale(f32 h, f32 v) { getPanePtr()->scale(h, v); }
     void resize(f32 x, f32 y) { getPanePtr()->resize(x, y); }