From 8151ed9701a204e77e8ddeba5f18f30a27cc8961 Mon Sep 17 00:00:00 2001 From: compugab Date: Fri, 26 Jun 2026 17:26:31 -0400 Subject: Matching and linking d_lyt_control_title --- include/d/lyt/d_lyt_control_title.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 include/d/lyt/d_lyt_control_title.h (limited to 'include') diff --git a/include/d/lyt/d_lyt_control_title.h b/include/d/lyt/d_lyt_control_title.h new file mode 100644 index 00000000..b5714f40 --- /dev/null +++ b/include/d/lyt/d_lyt_control_title.h @@ -0,0 +1,18 @@ +#ifndef D_LYT_CONTROL_TITLE_H +#define D_LYT_CONTROL_TITLE_H + +#include "d/d_base.h" + +class dLytControlTitle_c : public dBase_c { +public: + dLytControlTitle_c(); + virtual ~dLytControlTitle_c(); + + virtual int create() override; + virtual int doDelete() override; + virtual int execute() override; + virtual int draw() override; + +private: +}; +#endif -- cgit v1.2.3 From 5eb51e64aad15fdcf68fb4338af04ed53173f5fb Mon Sep 17 00:00:00 2001 From: compugab Date: Sun, 28 Jun 2026 20:20:19 -0400 Subject: matching d_lyt_demo_title .text to 48% --- include/d/d_stage.h | 2 + include/d/d_stage_mgr.h | 8 ++++ include/d/lyt/d_lyt_demo_title.h | 84 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 include/d/lyt/d_lyt_demo_title.h (limited to 'include') diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 1c238c2f..5b69d38d 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -164,6 +164,8 @@ public: return curr_room_id; } + dFader_c& getFader() { return mFader; } + bool fn_801B3EE0(); void fn_801B3F20(); void fn_801B3F30(); diff --git a/include/d/d_stage_mgr.h b/include/d/d_stage_mgr.h index 64bd6276..4771ba1e 100644 --- a/include/d/d_stage_mgr.h +++ b/include/d/d_stage_mgr.h @@ -121,6 +121,14 @@ public: return (field_0x88A0 & flag) != 0; } + void unsetFlags0x88a0(u32 flag){ + field_0x88A0 &= flag; + } + + void setFlags0x88a0(u32 flag){ + field_0x88A0 |= flag; + } + void initUnkWithWater(u32 val, d3d::UnkWithWater *waterThing); void destroyUnkWithWater(u32 val, d3d::UnkWithWater *waterThing); diff --git a/include/d/lyt/d_lyt_demo_title.h b/include/d/lyt/d_lyt_demo_title.h new file mode 100644 index 00000000..1933d0dd --- /dev/null +++ b/include/d/lyt/d_lyt_demo_title.h @@ -0,0 +1,84 @@ +#ifndef D_LYT_DEMO_TITLE_H +#define D_LYT_DEMO_TITLE_H + +#include "d/lyt/d2d.h" +#include "s/s_State.hpp" +#include "s/s_StateID.hpp" +#include "d/lyt/d_lyt_base.h" + +class dLytDemoTitleMain_c { +public: + dLytDemoTitleMain_c(); + virtual ~dLytDemoTitleMain_c(); + + bool fn_802B0760(d2d::ResAccIf_c *resAcc); + bool fn_802B0860(); + bool fn_802B0950(); + bool fn_802B0980(); + void fn_802B09F0(); + void fn_802B0A50(); + void fn_802B0B00(); + void fn_802B0B50(); + void fn_802B0BD0(); + void fn_802B0C20(); + + bool getmIsAnimating(){ + return mIsAnimating; + } + + d2d::LytBase_c getmLytBase(){ + return mLytBase; + } + +private: + STATE_FUNC_DECLARE(dLytDemoTitleMain_c, ModeNone); + STATE_FUNC_DECLARE(dLytDemoTitleMain_c, ModeIn); + STATE_FUNC_DECLARE(dLytDemoTitleMain_c, ModeMove); + STATE_FUNC_DECLARE(dLytDemoTitleMain_c, ModeOut); + STATE_FUNC_DECLARE(dLytDemoTitleMain_c, ModeEnd); + + /* 0x004 */ UI_STATE_MGR_DECLARE(dLytDemoTitleMain_c); + /* 0x040 */ d2d::LytBase_c mLytBase; + /* 0x0d0 */ d2d::AnmGroup_c mAnmGroups[2]; + /* 0x150 */ bool mIsAnimating; + +}; + +class dLytDemoTitle_c : public dLytBase_c { +public: + dLytDemoTitle_c(); + virtual ~dLytDemoTitle_c(); + + void fn_802B0C20(); + void fn_802B0CA0(); + void fn_802B0CB0(); + void fn_802B0CC0(); + void fn_802B0D20(); + void fn_802B0D30(); + void fn_802B0D40(); + void fn_802B0DB0(); + void fn_802B0DC0(); + void fn_802B0DD0(); + void fn_802B0E30(); + void fn_802B0E40(); + void fn_802B0E50(); + void fn_802B0E60(); + bool fn_802B1270(d2d::ResAccIf_c *resAcc); + +private: + STATE_FUNC_DECLARE(dLytDemoTitle_c, None); + STATE_FUNC_DECLARE(dLytDemoTitle_c, In); + STATE_FUNC_DECLARE(dLytDemoTitle_c, Move); + STATE_FUNC_DECLARE(dLytDemoTitle_c, Out); + STATE_FUNC_DECLARE(dLytDemoTitle_c, End); + + + /* 0x08c */ UI_STATE_MGR_DECLARE(dLytDemoTitle_c); + /* 0x040 */ u8 padding[0xcc-0x0c8]; + /* 0x0cc */ nw4r::lyt::ArcResourceAccessor mAccessor; + /* 0x17c */ nw4r::lyt::FontRefLink mFontRefLinks[5]; + /* 0x438 */ dLytDemoTitleMain_c mMain; + /* 0x58c */ bool mIsAnimating; + /* 0x58d */ bool field_0x58d; +}; +#endif -- cgit v1.2.3 From 23892057d79149bad84cd85bd7ce1828dda6d0de Mon Sep 17 00:00:00 2001 From: compugab Date: Tue, 30 Jun 2026 14:47:40 -0400 Subject: matching d_lyt_demo_title to 96% --- include/d/lyt/d_lyt_demo_title.h | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) (limited to 'include') diff --git a/include/d/lyt/d_lyt_demo_title.h b/include/d/lyt/d_lyt_demo_title.h index 1933d0dd..22f24674 100644 --- a/include/d/lyt/d_lyt_demo_title.h +++ b/include/d/lyt/d_lyt_demo_title.h @@ -2,13 +2,14 @@ #define D_LYT_DEMO_TITLE_H #include "d/lyt/d2d.h" +#include "d/lyt/d_lyt_base.h" #include "s/s_State.hpp" #include "s/s_StateID.hpp" -#include "d/lyt/d_lyt_base.h" + class dLytDemoTitleMain_c { public: - dLytDemoTitleMain_c(); + dLytDemoTitleMain_c(); virtual ~dLytDemoTitleMain_c(); bool fn_802B0760(d2d::ResAccIf_c *resAcc); @@ -22,11 +23,11 @@ public: void fn_802B0BD0(); void fn_802B0C20(); - bool getmIsAnimating(){ + bool getmIsAnimating() { return mIsAnimating; } - d2d::LytBase_c getmLytBase(){ + d2d::LytBase_c getmLytBase() { return mLytBase; } @@ -41,7 +42,6 @@ private: /* 0x040 */ d2d::LytBase_c mLytBase; /* 0x0d0 */ d2d::AnmGroup_c mAnmGroups[2]; /* 0x150 */ bool mIsAnimating; - }; class dLytDemoTitle_c : public dLytBase_c { @@ -49,34 +49,22 @@ public: dLytDemoTitle_c(); virtual ~dLytDemoTitle_c(); - void fn_802B0C20(); - void fn_802B0CA0(); - void fn_802B0CB0(); - void fn_802B0CC0(); - void fn_802B0D20(); - void fn_802B0D30(); - void fn_802B0D40(); - void fn_802B0DB0(); - void fn_802B0DC0(); - void fn_802B0DD0(); - void fn_802B0E30(); - void fn_802B0E40(); - void fn_802B0E50(); - void fn_802B0E60(); - bool fn_802B1270(d2d::ResAccIf_c *resAcc); + bool fn_802B1270(); + bool fn_802B1300(); + bool fn_802B13A0(); + bool fn_802B1410(); private: + static dLytDemoTitle_c *sInstance; + STATE_FUNC_DECLARE(dLytDemoTitle_c, None); STATE_FUNC_DECLARE(dLytDemoTitle_c, In); STATE_FUNC_DECLARE(dLytDemoTitle_c, Move); STATE_FUNC_DECLARE(dLytDemoTitle_c, Out); STATE_FUNC_DECLARE(dLytDemoTitle_c, End); - /* 0x08c */ UI_STATE_MGR_DECLARE(dLytDemoTitle_c); - /* 0x040 */ u8 padding[0xcc-0x0c8]; - /* 0x0cc */ nw4r::lyt::ArcResourceAccessor mAccessor; - /* 0x17c */ nw4r::lyt::FontRefLink mFontRefLinks[5]; + /* 0x040 */ d2d::ResAccIf_c resAcc; /* 0x438 */ dLytDemoTitleMain_c mMain; /* 0x58c */ bool mIsAnimating; /* 0x58d */ bool field_0x58d; -- cgit v1.2.3 From fcd69feddd802598181a12d90e06bf6018b7721b Mon Sep 17 00:00:00 2001 From: compugab Date: Thu, 9 Jul 2026 15:47:08 -0400 Subject: Fixing ctor and dtor --- include/d/lyt/d_lyt_demo_title.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/d/lyt/d_lyt_demo_title.h b/include/d/lyt/d_lyt_demo_title.h index 22f24674..39cf78c3 100644 --- a/include/d/lyt/d_lyt_demo_title.h +++ b/include/d/lyt/d_lyt_demo_title.h @@ -6,13 +6,12 @@ #include "s/s_State.hpp" #include "s/s_StateID.hpp" - class dLytDemoTitleMain_c { public: dLytDemoTitleMain_c(); - virtual ~dLytDemoTitleMain_c(); + virtual ~dLytDemoTitleMain_c() {}; - bool fn_802B0760(d2d::ResAccIf_c *resAcc); + bool build(d2d::ResAccIf_c *resAcc); bool fn_802B0860(); bool fn_802B0950(); bool fn_802B0980(); @@ -21,7 +20,6 @@ public: void fn_802B0B00(); void fn_802B0B50(); void fn_802B0BD0(); - void fn_802B0C20(); bool getmIsAnimating() { return mIsAnimating; @@ -46,23 +44,23 @@ private: class dLytDemoTitle_c : public dLytBase_c { public: - dLytDemoTitle_c(); - virtual ~dLytDemoTitle_c(); + dLytDemoTitle_c() : mStateMgr(*this) {} + virtual ~dLytDemoTitle_c() {} - bool fn_802B1270(); + virtual bool build() override; bool fn_802B1300(); bool fn_802B13A0(); bool fn_802B1410(); private: - static dLytDemoTitle_c *sInstance; - STATE_FUNC_DECLARE(dLytDemoTitle_c, None); STATE_FUNC_DECLARE(dLytDemoTitle_c, In); STATE_FUNC_DECLARE(dLytDemoTitle_c, Move); STATE_FUNC_DECLARE(dLytDemoTitle_c, Out); STATE_FUNC_DECLARE(dLytDemoTitle_c, End); + static dLytDemoTitle_c *sInstance; + /* 0x08c */ UI_STATE_MGR_DECLARE(dLytDemoTitle_c); /* 0x040 */ d2d::ResAccIf_c resAcc; /* 0x438 */ dLytDemoTitleMain_c mMain; -- cgit v1.2.3 From bfc02fcfff71eeec054f8bc4a00759a009df0693 Mon Sep 17 00:00:00 2001 From: robojumper Date: Sun, 26 Jul 2026 19:42:17 +0200 Subject: Fixes --- include/d/lyt/d_lyt_demo_title.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/d/lyt/d_lyt_demo_title.h b/include/d/lyt/d_lyt_demo_title.h index 39cf78c3..84a554a8 100644 --- a/include/d/lyt/d_lyt_demo_title.h +++ b/include/d/lyt/d_lyt_demo_title.h @@ -12,9 +12,9 @@ public: virtual ~dLytDemoTitleMain_c() {}; bool build(d2d::ResAccIf_c *resAcc); - bool fn_802B0860(); - bool fn_802B0950(); - bool fn_802B0980(); + bool execute(); + bool draw(); + bool remove(); void fn_802B09F0(); void fn_802B0A50(); void fn_802B0B00(); @@ -47,10 +47,10 @@ public: dLytDemoTitle_c() : mStateMgr(*this) {} virtual ~dLytDemoTitle_c() {} - virtual bool build() override; - bool fn_802B1300(); - bool fn_802B13A0(); - bool fn_802B1410(); + virtual int create() override; + virtual int execute() override; + virtual int draw() override; + virtual int doDelete() override; private: STATE_FUNC_DECLARE(dLytDemoTitle_c, None); @@ -59,6 +59,8 @@ private: STATE_FUNC_DECLARE(dLytDemoTitle_c, Out); STATE_FUNC_DECLARE(dLytDemoTitle_c, End); + STATE_MGR_DEFINE_UTIL_INSTANCIATE_STATE(dLytDemoTitle_c); + static dLytDemoTitle_c *sInstance; /* 0x08c */ UI_STATE_MGR_DECLARE(dLytDemoTitle_c); -- cgit v1.2.3