summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/JSystem/J2DGraph/J2DGrafContext.h4
-rw-r--r--include/Z2AudioLib/Z2WolfHowlMgr.h1
-rw-r--r--include/d/a/d_a_alink.h6
-rw-r--r--include/d/d_drawlist.h4
-rw-r--r--include/d/msg/d_msg_object.h2
-rw-r--r--include/d/pane/d_pane_class.h12
-rw-r--r--include/msg/scrn/d_msg_scrn_howl.h111
7 files changed, 139 insertions, 1 deletions
diff --git a/include/JSystem/J2DGraph/J2DGrafContext.h b/include/JSystem/J2DGraph/J2DGrafContext.h
index b2e49ced53..ffa54f2e52 100644
--- a/include/JSystem/J2DGraph/J2DGrafContext.h
+++ b/include/JSystem/J2DGraph/J2DGrafContext.h
@@ -17,6 +17,10 @@ public:
/* 802E8B08 */ J2DGrafContext(f32 x, f32 y, f32 width, f32 height);
/* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const& bounds);
+ void scissor(f32 x, f32 y, f32 width, f32 height) {
+ scissor(JGeometry::TBox2<f32>(x, y, x + width, y + height));
+ }
+
void setColor(JUtility::TColor c) { this->setColor(c, c, c, c); }
/* 802E9118 */ void setColor(JUtility::TColor colorTL, JUtility::TColor colorTR,
JUtility::TColor colorBR, JUtility::TColor colorBL);
diff --git a/include/Z2AudioLib/Z2WolfHowlMgr.h b/include/Z2AudioLib/Z2WolfHowlMgr.h
index 05faf2fd81..3e7a586d04 100644
--- a/include/Z2AudioLib/Z2WolfHowlMgr.h
+++ b/include/Z2AudioLib/Z2WolfHowlMgr.h
@@ -45,6 +45,7 @@ public:
void setCorrectCurve(s8 i_curve) { setCorrectData(i_curve, NULL); }
u32 getTimer() { return mTimer; }
u8 getReleaseTimer() { return mReleaseTimer; }
+ u8 getCorrectCurveID() { return mCorrectCurveID; }
private:
/* 0x00 */ JAISoundHandle field_0x00;
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); }
diff --git a/include/msg/scrn/d_msg_scrn_howl.h b/include/msg/scrn/d_msg_scrn_howl.h
index ace00b4355..73d504f7cc 100644
--- a/include/msg/scrn/d_msg_scrn_howl.h
+++ b/include/msg/scrn/d_msg_scrn_howl.h
@@ -2,5 +2,116 @@
#define MSG_SCRN_D_MSG_SCRN_HOWL_H
#include "dolphin/types.h"
+#include "msg/scrn/d_msg_scrn_base.h"
+
+struct dMsgScrnHowl_c : public dMsgScrnBase_c {
+ /* 8024096C */ dMsgScrnHowl_c();
+ /* 80241784 */ ~dMsgScrnHowl_c();
+ /* 80241A70 */ void exec();
+ /* 80241C30 */ void drawSelf();
+ /* 80241D58 */ void guide_on_init();
+ /* 80241D5C */ void guide_on_proc();
+ /* 80241DFC */ void guide_off_init();
+ /* 80241E00 */ void guide_off_proc();
+ /* 80241E7C */ void guide_stop_init();
+ /* 80241E80 */ void guide_stop_proc();
+ /* 80241F28 */ void guide_demo_play_init();
+ /* 80241F34 */ void guide_demo_play_proc();
+ /* 8024202C */ void guide_off_test_init();
+ /* 80242030 */ void guide_off_test_proc();
+ /* 80242034 */ void fukiScale(f32);
+ /* 80242038 */ void fukiTrans(f32, f32);
+ /* 8024205C */ void fukiAlpha(f32);
+ /* 80242080 */ bool isKeyCheck();
+ /* 802420D4 */ void resetLine();
+ /* 80242198 */ void drawWave();
+ /* 802427A8 */ void drawGuide();
+ /* 80242FE4 */ void drawGuide2();
+ /* 802435BC */ void drawEffect();
+ /* 80243838 */ void calcMain();
+ /* 8024389C */ void calcWave();
+ /* 80243A50 */ void calcGuide();
+ /* 80243BE0 */ void moveLineV(bool);
+ /* 80243DCC */ void moveBaseLength(bool);
+ /* 80243EEC */ s8 getOnLineNum(int);
+ /* 80243F58 */ s16 addCount(s16);
+ /* 80243F7C */ s16 addCountGuide(s16);
+ /* 80243F94 */ f32 getNowPlotPitch(f32);
+ /* 80244108 */ f32 getPlotPitch(f32);
+ /* 8024414C */ void calcPitchLevel();
+ /* 802441FC */ void initGuideData();
+ /* 80244304 */ u16 getGuideDataSize();
+ /* 8024438C */ u8 getGuideDataType(int);
+
+ /* 0x00C4 */ CPaneMgr* mpLineH[3];
+ /* 0x00D0 */ CPaneMgr* mpLineV[7];
+ /* 0x00EC */ CPaneMgr* mpLineAll;
+ /* 0x00F0 */ CPaneMgr* mpABase;
+ /* 0x00F4 */ CPaneMgr* mpButtonIcon[2];
+ /* 0x00FC */ CPaneMgr* mpButtonText[2];
+ /* 0x0104 */ J2DPicture* mpTopBall;
+ /* 0x0108 */ J2DPicture* mpTopBallTail[5];
+ /* 0x011C */ J2DPicture* mpDot;
+ /* 0x0120 */ J2DPicture* mpGuideDot;
+ /* 0x0124 */ J2DPicture* mpWaveTex;
+ /* 0x0128 */ Vec field_0x128;
+ /* 0x0134 */ Vec field_0x134;
+ /* 0x0140 */ Vec field_0x140;
+ /* 0x014C */ Vec field_0x14c;
+ /* 0x0158 */ Vec field_0x158;
+ /* 0x0164 */ Vec field_0x164;
+ /* 0x0170 */ Vec field_0x170;
+ /* 0x017C */ u32 field_0x17c;
+ /* 0x0180 */ f32 field_0x180[0x300];
+ /* 0x0D80 */ f32 field_0xd80[0x300];
+ /* 0x1980 */ f32 field_0x1980;
+ /* 0x1984 */ f32 field_0x1984;
+ /* 0x1988 */ f32 field_0x1988;
+ /* 0x198C */ f32 field_0x198c;
+ /* 0x1990 */ f32 field_0x1990;
+ /* 0x1994 */ f32 field_0x1994;
+ /* 0x1998 */ f32 field_0x1998;
+ /* 0x199C */ f32 field_0x199c;
+ /* 0x19A0 */ f32 field_0x19a0[30];
+ /* 0x1A18 */ f32 field_0x1a18[30];
+ /* 0x1A90 */ f32 field_0x1a90[30];
+ /* 0x1B08 */ f32 field_0x1b08[3];
+ /* 0x1B14 */ s16 field_0x1b14[0x300];
+ /* 0x2114 */ u32 field_0x2114;
+ /* 0x2118 */ u32 field_0x2118;
+ /* 0x211C */ u32 field_0x211c;
+ /* 0x2120 */ u32 field_0x2120;
+ /* 0x2124 */ s16 field_0x2124;
+ /* 0x2126 */ u16 field_0x2126;
+ /* 0x2128 */ s16 field_0x2128;
+ /* 0x212A */ s16 mPlotTime;
+ /* 0x212C */ s16 field_0x212c;
+ /* 0x212E */ s16 field_0x212e;
+ /* 0x2130 */ s16 field_0x2130;
+ /* 0x2132 */ s16 field_0x2132;
+ /* 0x2134 */ s16 field_0x2134;
+ /* 0x2136 */ s16 field_0x2136;
+ /* 0x2138 */ u16 field_0x2138;
+ /* 0x213A */ u8 field_0x213a[30];
+ /* 0x2158 */ u8 field_0x2158[30];
+ /* 0x2176 */ u8 field_0x2176[30];
+ /* 0x2194 */ s8 field_0x2194;
+ /* 0x2195 */ u8 field_0x2195;
+ /* 0x2196 */ u8 mCorrectLineMax;
+ /* 0x2197 */ u8 field_0x2197;
+ /* 0x2198 */ u8 field_0x2198[0x300];
+ /* 0x2498 */ u8 field_0x2498[0x300];
+ /* 0x2798 */ u8 field_0x2798;
+ /* 0x2799 */ u8 field_0x2799;
+ /* 0x279A */ u8 field_0x279a;
+ /* 0x279B */ u8 field_0x279b;
+ /* 0x279C */ f32 field_0x279c;
+ /* 0x27A0 */ f32 field_0x27a0;
+ /* 0x27A4 */ f32 field_0x27a4;
+ /* 0x27A8 */ f32 field_0x27a8;
+};
+
+#define LINE_MAX 30
+#define PLOT_BUFFER_MAX_e 0x300
#endif /* MSG_SCRN_D_MSG_SCRN_HOWL_H */
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 08:27:54 +0000