d_lyt_help OK

This commit is contained in:
robojumper
2025-08-15 21:56:24 +02:00
parent 897de53b2d
commit 3e3487e834
15 changed files with 944 additions and 239 deletions
+2
View File
@@ -10,6 +10,8 @@ void defaultSet();
void drawBefore();
void draw();
void setLytAllocator();
} // namespace d2d
#endif
+1
View File
@@ -37,6 +37,7 @@ public:
private:
/* 0x00068 */ UI_STATE_MGR_DECLARE(dLytControlGame_c);
static dLytControlGame_c *sInstance;
};
+89
View File
@@ -0,0 +1,89 @@
#ifndef D_LYT_HELP_H
#define D_LYT_HELP_H
#include "common.h"
#include "d/lyt/d2d.h"
#include "d/lyt/d_textbox.h"
#include "m/m2d.h"
#include "s/s_State.hpp"
class dLytHelpMain_c {
public:
dLytHelpMain_c();
virtual ~dLytHelpMain_c() {}
bool build(d2d::ResAccIf_c *resAcc);
bool remove();
bool execute();
bool draw();
void modeRequestIn(s32 textIndex);
void modeRequestWait();
void modeRequestOut();
void modeRequestEnd();
void modeRequestNone();
bool isIdle() const {
return mIsIdle;
}
void setText(s32 textIndex);
private:
STATE_FUNC_DECLARE(dLytHelpMain_c, ModeNone);
STATE_FUNC_DECLARE(dLytHelpMain_c, ModeIn);
STATE_FUNC_DECLARE(dLytHelpMain_c, ModeWait);
STATE_FUNC_DECLARE(dLytHelpMain_c, ModeOut);
STATE_FUNC_DECLARE(dLytHelpMain_c, ModeEnd);
/* 0x004 */ UI_STATE_MGR_DECLARE(dLytHelpMain_c);
/* 0x040 */ d2d::LytBase_c mLyt;
/* 0x0D0 */ d2d::AnmGroup_c mAnm[3];
/* 0x190 */ dTextBox_c *mpTextBoxesTitleS[3];
/* 0x19C */ dTextBox_c *mpTextBoxesTitle[3];
/* 0x1A8 */ dTextBox_c *mpTextBoxesS[3];
/* 0x1B4 */ dTextBox_c *mpTextBoxes[3];
/* 0x1C0 */ bool mIsIdle;
/* 0x1C4 */ s32 mTextIndex;
/* 0x1C8 */ s32 field_0x1C8;
/* 0x1CC */ s32 field_0x1CC;
};
class dLytHelp_c : public m2d::Base_c {
public:
dLytHelp_c() : mStateMgr(*this, sStateID::null) {
sInstance = this;
}
virtual ~dLytHelp_c() {
sInstance = nullptr;
}
virtual void draw() override;
virtual bool build();
virtual bool remove();
virtual bool execute();
bool setText(s32 textIndex);
void changeText(s32 textIndex);
private:
static dLytHelp_c *sInstance;
STATE_FUNC_DECLARE(dLytHelp_c, None);
STATE_FUNC_DECLARE(dLytHelp_c, In);
STATE_FUNC_DECLARE(dLytHelp_c, Wait);
STATE_FUNC_DECLARE(dLytHelp_c, Out);
STATE_FUNC_DECLARE(dLytHelp_c, End);
STATE_MGR_DEFINE_UTIL_ISSTATE(dLytHelp_c);
/* 0x010 */ UI_STATE_MGR_DECLARE(dLytHelp_c);
/* 0x04C */ d2d::ResAccIf_c mResAcc;
/* 0x3BC */ dLytHelpMain_c *mpMain;
/* 0x3C0 */ bool field_0x3C0;
/* 0x3C1 */ bool field_0x3C1;
/* 0x3C2 */ bool field_0x3C2;
/* 0x3C4 */ s32 mTextIndex;
/* 0x3C8 */ s32 field_0x3C8;
};
#endif
+3 -3
View File
@@ -22,8 +22,8 @@ public:
void setHeight(f32 height);
bool wantsMove() {
return mWantsModeChange;
bool isIdle() {
return mIsIdle;
}
const d2d::dLytSub &getLyt() const {
@@ -43,7 +43,7 @@ private:
/* 0x004 */ UI_STATE_MGR_DECLARE(dLytSkyGaugeMain_c);
/* 0x040 */ d2d::dLytSub mLyt;
/* 0x0D4 */ d2d::AnmGroup_c mAnmGroups[3];
/* 0x194 */ bool mWantsModeChange;
/* 0x194 */ bool mIsIdle;
/* 0x195 */ bool field_0x195; // unused
};
+7 -3
View File
@@ -187,7 +187,7 @@ private:
/* 0x13771 */ bool field_0x13771;
/* 0x13772 */ bool field_0x13772;
/* 0x13773 */ bool field_0x13773;
/* 0x13774 */ bool field_0x13774;
/* 0x13774 */ bool mHelpOpen;
/* 0x13775 */ bool field_0x13775;
/* 0x13776 */ bool mTimerVisible;
/* 0x13777 */ bool mBirdGaugeVisible;
@@ -276,8 +276,12 @@ public:
mMain.field_0x13773 = value;
}
bool getMeterField_0x13774() const {
return mMain.field_0x13774;
bool isHelpOpen() const {
return mMain.mHelpOpen;
}
void setHelpOpen(bool val) {
mMain.mHelpOpen = val;
}
void setMeterField_0x13775(bool val) {
+2 -1
View File
@@ -231,7 +231,8 @@ private:
u32 field_0x94;
};
void getAllocator();
// Inofficial, not found in NSMBW
void setLytAllocator();
} // namespace m2d