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 --- src/d/lyt/d_lyt_control_title.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/d/lyt/d_lyt_control_title.cpp (limited to 'src') diff --git a/src/d/lyt/d_lyt_control_title.cpp b/src/d/lyt/d_lyt_control_title.cpp new file mode 100644 index 00000000..f2ff2015 --- /dev/null +++ b/src/d/lyt/d_lyt_control_title.cpp @@ -0,0 +1,29 @@ +#include "d/lyt/d_lyt_control_title.h" + +#include "f/f_base.h" + + +SPECIAL_BASE_PROFILE(LYT_CONTROL_TITLE, dLytControlTitle_c, fProfile::LYT_CONTROL_TITLE, 0X2AB, 0); + +dLytControlTitle_c::dLytControlTitle_c() {} + + +int dLytControlTitle_c::create() { + return SUCCEEDED; +} + + + +int dLytControlTitle_c::doDelete() { + return SUCCEEDED; +} + +int dLytControlTitle_c::execute() { + return SUCCEEDED; +} + +int dLytControlTitle_c::draw() { + return SUCCEEDED; +} + +dLytControlTitle_c::~dLytControlTitle_c() {} -- 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% --- src/d/lyt/d_lyt_control_title.cpp | 2 - src/d/lyt/d_lyt_demo_title.cpp | 292 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 292 insertions(+), 2 deletions(-) create mode 100644 src/d/lyt/d_lyt_demo_title.cpp (limited to 'src') diff --git a/src/d/lyt/d_lyt_control_title.cpp b/src/d/lyt/d_lyt_control_title.cpp index f2ff2015..476cdfb1 100644 --- a/src/d/lyt/d_lyt_control_title.cpp +++ b/src/d/lyt/d_lyt_control_title.cpp @@ -12,8 +12,6 @@ int dLytControlTitle_c::create() { return SUCCEEDED; } - - int dLytControlTitle_c::doDelete() { return SUCCEEDED; } diff --git a/src/d/lyt/d_lyt_demo_title.cpp b/src/d/lyt/d_lyt_demo_title.cpp new file mode 100644 index 00000000..472ecfcb --- /dev/null +++ b/src/d/lyt/d_lyt_demo_title.cpp @@ -0,0 +1,292 @@ +#include "d/lyt/d_lyt_demo_title.h" + +#include "d/d_fader.h" +#include "d/d_stage.h" +#include "d/d_stage_mgr.h" +#include "d/d_sys.h" +#include "d/lyt/d_lyt_deposit.h" +#include "toBeSorted/arc_managers/layout_arc_manager.h" + +extern "C" u32 lbl_805B7120; + +#define TITLE_DEMO_MAIN_ANIM_IN 0 +#define TITLE_DEMO_MAIN_ANIM_OUT 1 + +STATE_DEFINE(dLytDemoTitleMain_c, ModeNone); +STATE_DEFINE(dLytDemoTitleMain_c, ModeIn); +STATE_DEFINE(dLytDemoTitleMain_c, ModeMove); +STATE_DEFINE(dLytDemoTitleMain_c, ModeOut); +STATE_DEFINE(dLytDemoTitleMain_c, ModeEnd); + +STATE_DEFINE(dLytDemoTitle_c, None); +STATE_DEFINE(dLytDemoTitle_c, In); +STATE_DEFINE(dLytDemoTitle_c, Move); +STATE_DEFINE(dLytDemoTitle_c, Out); +STATE_DEFINE(dLytDemoTitle_c, End); + +void dLytDemoTitleMain_c::initializeState_ModeNone() { + return; +} + +void dLytDemoTitleMain_c::executeState_ModeNone() { + mIsAnimating = true; + return; +} + +void dLytDemoTitleMain_c::finalizeState_ModeNone() { + return; +} + +void dLytDemoTitleMain_c::initializeState_ModeIn() { + return; +} + +void dLytDemoTitleMain_c::executeState_ModeIn() { + if (mAnmGroups[TITLE_DEMO_MAIN_ANIM_IN].isEndReached()) { + mAnmGroups[TITLE_DEMO_MAIN_ANIM_IN].setAnimEnable(false); + mIsAnimating = true; + } + return; +} + +void dLytDemoTitleMain_c::finalizeState_ModeIn() { + return; +} + +void dLytDemoTitleMain_c::initializeState_ModeMove() { + return; +} + +void dLytDemoTitleMain_c::executeState_ModeMove() { + mIsAnimating = true; + return; +} + +void dLytDemoTitleMain_c::finalizeState_ModeMove() { + return; +} + +void dLytDemoTitleMain_c::initializeState_ModeOut() { + return; +} + +void dLytDemoTitleMain_c::executeState_ModeOut() { + if (mAnmGroups[TITLE_DEMO_MAIN_ANIM_OUT].isEndReached()) { + mAnmGroups[TITLE_DEMO_MAIN_ANIM_OUT].setAnimEnable(false); + mIsAnimating = true; + } + return; +} + +void dLytDemoTitleMain_c::finalizeState_ModeOut() { + return; +} + +void dLytDemoTitleMain_c::initializeState_ModeEnd() { + return; +} + +void dLytDemoTitleMain_c::executeState_ModeEnd() { + mIsAnimating = true; + return; +} + +void dLytDemoTitleMain_c::finalizeState_ModeEnd() { + return; +} + +dLytDemoTitleMain_c::dLytDemoTitleMain_c() : mStateMgr(*this) {} + +static const d2d::LytBrlanMapping brlanMap[] = { + { "demoTitle_00_in.brlan", "G_inOut_00"}, + {"demoTitle_00_out.brlan", "G_inOut_00"}, +}; + +bool dLytDemoTitleMain_c::fn_802B0760(d2d::ResAccIf_c *resAcc) { + mLytBase.setResAcc(resAcc); + mLytBase.build("demoTitle_00.brlyt", nullptr); + mLytBase.setPriority(0x86); + + for (int i = 0; i < 2; i++) { + mAnmGroups[i].init(brlanMap[i].mFile, resAcc, mLytBase.getLayout(), brlanMap[i].mName); + mAnmGroups[i].bind(false); + mAnmGroups[i].setAnimEnable(false); + } + + mAnmGroups[TITLE_DEMO_MAIN_ANIM_IN].setAnimEnable(true); + mAnmGroups[TITLE_DEMO_MAIN_ANIM_IN].setFrame(0.0f); + + mLytBase.calc(); + + mAnmGroups[TITLE_DEMO_MAIN_ANIM_IN].setAnimEnable(false); + + fn_802B09F0(); + + return true; +} + +bool dLytDemoTitleMain_c::fn_802B0860() { + mLytBase.getLayout()->GetRootPane()->SetInfluencedAlpha(true); + mLytBase.getLayout()->GetRootPane()->SetAlpha(255 - dStage_c::GetInstance()->getFader().getColorFaderAlpha()); + + mStateMgr.executeState(); + + for (int i = 0; i < 2; i++) { + if (mAnmGroups[i].isEnabled()) { + mAnmGroups[i].play(); + } + } + + mLytBase.calc(); + + return true; +} + +bool dLytDemoTitleMain_c::fn_802B0950() { + mLytBase.addToDrawList(); + return true; +} + +bool dLytDemoTitleMain_c::fn_802B0980() { + dStageMgr_c::GetInstance()->unsetFlags0x88a0(0xfffffffe); + + mLytBase.unbindAnims(); + + for (int i = 0; i < 2; i++) { + mAnmGroups[i].remove(); + } + return true; +} + +void dLytDemoTitleMain_c::fn_802B09F0() { + mStateMgr.changeState(StateID_ModeNone); + mIsAnimating = false; + return; +} + +void dLytDemoTitleMain_c::fn_802B0A50() { + dStageMgr_c::GetInstance()->setFlags0x88a0(0x1); + + dSys_c::setClearColor(mColor(0xFF)); + + mAnmGroups[TITLE_DEMO_MAIN_ANIM_IN].setAnimEnable(true); + mAnmGroups[TITLE_DEMO_MAIN_ANIM_IN].setFrame(0.0f); + mLytBase.calc(); + mStateMgr.changeState(StateID_ModeIn); + mIsAnimating = false; +} + +void dLytDemoTitleMain_c::fn_802B0B00(){ + mStateMgr.changeState(StateID_ModeMove); + mIsAnimating = false; + return; +} + +void dLytDemoTitleMain_c::fn_802B0B50(){ + mAnmGroups[TITLE_DEMO_MAIN_ANIM_OUT].setAnimEnable(true); + mAnmGroups[TITLE_DEMO_MAIN_ANIM_OUT].setFrame(0.0f); + mLytBase.calc(); + mStateMgr.changeState(StateID_ModeOut); + mIsAnimating = false; + return; +} + +void dLytDemoTitleMain_c::fn_802B0BD0(){ + mStateMgr.changeState(StateID_ModeEnd); + mIsAnimating = false; + return; +} + +void dLytDemoTitleMain_c::fn_802B0C20(){ + return; +} + +void dLytDemoTitle_c::fn_802B0C20(){ + if (mIsAnimating) { + mMain.fn_802B0A50(); + mStateMgr.changeState(StateID_In); + mIsAnimating=false; + } + return; +} + +void dLytDemoTitle_c::fn_802B0CA0(){ + return; +} + +void dLytDemoTitle_c::fn_802B0CB0(){ + return; +} + +void dLytDemoTitle_c::fn_802B0CC0(){ + if (mMain.getmIsAnimating()) { + mMain.fn_802B0B00(); + mStateMgr.changeState(StateID_Move); + } + return; +} + +void dLytDemoTitle_c::fn_802B0D20(){ + return; +} + +void dLytDemoTitle_c::fn_802B0D30(){ + return; +} + +void dLytDemoTitle_c::fn_802B0D40(){ + if (mMain.getmIsAnimating() && field_0x58d) { + mMain.fn_802B0B50(); + mStateMgr.changeState(StateID_Out); + field_0x58d=false; + } + return; +} + +void dLytDemoTitle_c::fn_802B0DB0(){ + return; +} + +void dLytDemoTitle_c::fn_802B0DC0(){ + return; +} + +void dLytDemoTitle_c::fn_802B0DD0(){ + + if (mMain.getmIsAnimating()) { + deleteRequest(); + mMain.fn_802B0BD0(); + mStateMgr.changeState(StateID_End); + } + + return; +} + +void dLytDemoTitle_c::fn_802B0E30(){ + return; +} + +void dLytDemoTitle_c::fn_802B0E40(){ + return; +} + +void dLytDemoTitle_c::fn_802B0E50(){ + return; +} + +void dLytDemoTitle_c::fn_802B0E60(){ + return; +} + +dLytDemoTitle_c::dLytDemoTitle_c() : mStateMgr(*this) {} + +dLytDemoTitleMain_c::~dLytDemoTitleMain_c() {} + +bool dLytDemoTitle_c::fn_802B1270(d2d::ResAccIf_c *resAcc){ + + mMain.fn_802B0760(resAcc); + mStateMgr.changeState(StateID_None); + mIsAnimating=true; + field_0x58d=false; + return true; +} -- 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% --- src/d/lyt/d_lyt_demo_title.cpp | 104 +++++++++++++++++++++++++++-------------- 1 file changed, 68 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/d/lyt/d_lyt_demo_title.cpp b/src/d/lyt/d_lyt_demo_title.cpp index 472ecfcb..0f3318fd 100644 --- a/src/d/lyt/d_lyt_demo_title.cpp +++ b/src/d/lyt/d_lyt_demo_title.cpp @@ -4,7 +4,9 @@ #include "d/d_stage.h" #include "d/d_stage_mgr.h" #include "d/d_sys.h" +#include "d/lyt/d2d.h" #include "d/lyt/d_lyt_deposit.h" +#include "d/lyt/d_lyt_map_global.h" #include "toBeSorted/arc_managers/layout_arc_manager.h" extern "C" u32 lbl_805B7120; @@ -168,7 +170,7 @@ void dLytDemoTitleMain_c::fn_802B0A50() { dStageMgr_c::GetInstance()->setFlags0x88a0(0x1); dSys_c::setClearColor(mColor(0xFF)); - + mAnmGroups[TITLE_DEMO_MAIN_ANIM_IN].setAnimEnable(true); mAnmGroups[TITLE_DEMO_MAIN_ANIM_IN].setFrame(0.0f); mLytBase.calc(); @@ -176,105 +178,104 @@ void dLytDemoTitleMain_c::fn_802B0A50() { mIsAnimating = false; } -void dLytDemoTitleMain_c::fn_802B0B00(){ +void dLytDemoTitleMain_c::fn_802B0B00() { mStateMgr.changeState(StateID_ModeMove); mIsAnimating = false; - return; + return; } -void dLytDemoTitleMain_c::fn_802B0B50(){ +void dLytDemoTitleMain_c::fn_802B0B50() { mAnmGroups[TITLE_DEMO_MAIN_ANIM_OUT].setAnimEnable(true); mAnmGroups[TITLE_DEMO_MAIN_ANIM_OUT].setFrame(0.0f); mLytBase.calc(); mStateMgr.changeState(StateID_ModeOut); mIsAnimating = false; - return; + return; } -void dLytDemoTitleMain_c::fn_802B0BD0(){ +void dLytDemoTitleMain_c::fn_802B0BD0() { mStateMgr.changeState(StateID_ModeEnd); mIsAnimating = false; - return; + return; } -void dLytDemoTitleMain_c::fn_802B0C20(){ +void dLytDemoTitle_c::initializeState_In() { return; } -void dLytDemoTitle_c::fn_802B0C20(){ +void dLytDemoTitle_c::executeState_In() { if (mIsAnimating) { mMain.fn_802B0A50(); mStateMgr.changeState(StateID_In); - mIsAnimating=false; - } - return; + mIsAnimating = false; + } + return; } -void dLytDemoTitle_c::fn_802B0CA0(){ +void dLytDemoTitle_c::finalizeState_In() { return; } -void dLytDemoTitle_c::fn_802B0CB0(){ +void dLytDemoTitle_c::initializeState_Move() { return; } -void dLytDemoTitle_c::fn_802B0CC0(){ +void dLytDemoTitle_c::executeState_Move() { if (mMain.getmIsAnimating()) { mMain.fn_802B0B00(); mStateMgr.changeState(StateID_Move); - } - return; + } + return; } -void dLytDemoTitle_c::fn_802B0D20(){ +void dLytDemoTitle_c::finalizeState_Move() { return; } -void dLytDemoTitle_c::fn_802B0D30(){ +void dLytDemoTitle_c::initializeState_Out() { return; } -void dLytDemoTitle_c::fn_802B0D40(){ +void dLytDemoTitle_c::executeState_Out() { if (mMain.getmIsAnimating() && field_0x58d) { mMain.fn_802B0B50(); mStateMgr.changeState(StateID_Out); - field_0x58d=false; - } - return; + field_0x58d = false; + } + return; } -void dLytDemoTitle_c::fn_802B0DB0(){ +void dLytDemoTitle_c::finalizeState_Out() { return; } -void dLytDemoTitle_c::fn_802B0DC0(){ +void dLytDemoTitle_c::initializeState_End() { return; } -void dLytDemoTitle_c::fn_802B0DD0(){ - +void dLytDemoTitle_c::executeState_End() { if (mMain.getmIsAnimating()) { deleteRequest(); mMain.fn_802B0BD0(); mStateMgr.changeState(StateID_End); } - + return; } -void dLytDemoTitle_c::fn_802B0E30(){ +void dLytDemoTitle_c::finalizeState_End() { return; } -void dLytDemoTitle_c::fn_802B0E40(){ +void dLytDemoTitle_c::initializeState_None() { return; } -void dLytDemoTitle_c::fn_802B0E50(){ +void dLytDemoTitle_c::executeState_None() { return; } -void dLytDemoTitle_c::fn_802B0E60(){ +void dLytDemoTitle_c::finalizeState_None() { return; } @@ -282,11 +283,42 @@ dLytDemoTitle_c::dLytDemoTitle_c() : mStateMgr(*this) {} dLytDemoTitleMain_c::~dLytDemoTitleMain_c() {} -bool dLytDemoTitle_c::fn_802B1270(d2d::ResAccIf_c *resAcc){ +extern "C" char *lbl_805759D0; + +bool dLytDemoTitle_c::fn_802B1270(){ + sInstance = this; + + resAcc.attach(LayoutArcManager::GetInstance()->getLoadedData("DemoTitle"), ""); - mMain.fn_802B0760(resAcc); + mMain.fn_802B0760(&resAcc); mStateMgr.changeState(StateID_None); - mIsAnimating=true; - field_0x58d=false; + mIsAnimating = true; + field_0x58d = false; + return true; +} + +bool dLytDemoTitle_c::fn_802B1300() { + if (*mStateMgr.getStateID() != StateID_None) { + mMain.fn_802B0860(); + } + + mStateMgr.executeState(); + return true; } + +bool dLytDemoTitle_c::fn_802B13A0() { + if (*mStateMgr.getStateID() != StateID_None) { + mMain.fn_802B0950(); + } + return true; +} + +bool dLytDemoTitle_c::fn_802B1410() { + mMain.fn_802B0980(); + resAcc.detach(); + lbl_805759D0=0; + return true; +} + +dLytDemoTitle_c::~dLytDemoTitle_c() {} -- 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 --- src/d/lyt/d_lyt_demo_title.cpp | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/d/lyt/d_lyt_demo_title.cpp b/src/d/lyt/d_lyt_demo_title.cpp index 0f3318fd..716ab6f8 100644 --- a/src/d/lyt/d_lyt_demo_title.cpp +++ b/src/d/lyt/d_lyt_demo_title.cpp @@ -26,6 +26,8 @@ STATE_DEFINE(dLytDemoTitle_c, Move); STATE_DEFINE(dLytDemoTitle_c, Out); STATE_DEFINE(dLytDemoTitle_c, End); +dLytDemoTitle_c *dLytDemoTitle_c::sInstance; + void dLytDemoTitleMain_c::initializeState_ModeNone() { return; } @@ -104,7 +106,7 @@ static const d2d::LytBrlanMapping brlanMap[] = { {"demoTitle_00_out.brlan", "G_inOut_00"}, }; -bool dLytDemoTitleMain_c::fn_802B0760(d2d::ResAccIf_c *resAcc) { +bool dLytDemoTitleMain_c::build(d2d::ResAccIf_c *resAcc) { mLytBase.setResAcc(resAcc); mLytBase.build("demoTitle_00.brlyt", nullptr); mLytBase.setPriority(0x86); @@ -279,18 +281,23 @@ void dLytDemoTitle_c::finalizeState_None() { return; } -dLytDemoTitle_c::dLytDemoTitle_c() : mStateMgr(*this) {} - -dLytDemoTitleMain_c::~dLytDemoTitleMain_c() {} +SPECIAL_BASE_PROFILE(LYT_DEMO_TITLE, dLytDemoTitle_c, fProfile::LYT_DEMO_TITLE, 0x2BA, 0); extern "C" char *lbl_805759D0; -bool dLytDemoTitle_c::fn_802B1270(){ +const d2d::LytBrlanMapping lbl_804EFAA0[] = { + { "in", "G_inOut_00" }, + { "loop", "G_loop_00" }, + { "out", "G_inOut_00" }, +}; + +bool dLytDemoTitle_c::build() { + d2d::LytBrlanMapping x = lbl_804EFAA0[0]; sInstance = this; - + resAcc.attach(LayoutArcManager::GetInstance()->getLoadedData("DemoTitle"), ""); - mMain.fn_802B0760(&resAcc); + mMain.build(&resAcc); mStateMgr.changeState(StateID_None); mIsAnimating = true; field_0x58d = false; @@ -310,15 +317,13 @@ bool dLytDemoTitle_c::fn_802B1300() { bool dLytDemoTitle_c::fn_802B13A0() { if (*mStateMgr.getStateID() != StateID_None) { mMain.fn_802B0950(); - } + } return true; } bool dLytDemoTitle_c::fn_802B1410() { mMain.fn_802B0980(); resAcc.detach(); - lbl_805759D0=0; + lbl_805759D0 = 0; return true; } - -dLytDemoTitle_c::~dLytDemoTitle_c() {} -- 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 --- src/d/lyt/d_lyt_demo_title.cpp | 71 ++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 41 deletions(-) (limited to 'src') diff --git a/src/d/lyt/d_lyt_demo_title.cpp b/src/d/lyt/d_lyt_demo_title.cpp index 716ab6f8..15ea8910 100644 --- a/src/d/lyt/d_lyt_demo_title.cpp +++ b/src/d/lyt/d_lyt_demo_title.cpp @@ -5,8 +5,6 @@ #include "d/d_stage_mgr.h" #include "d/d_sys.h" #include "d/lyt/d2d.h" -#include "d/lyt/d_lyt_deposit.h" -#include "d/lyt/d_lyt_map_global.h" #include "toBeSorted/arc_managers/layout_arc_manager.h" extern "C" u32 lbl_805B7120; @@ -129,7 +127,7 @@ bool dLytDemoTitleMain_c::build(d2d::ResAccIf_c *resAcc) { return true; } -bool dLytDemoTitleMain_c::fn_802B0860() { +bool dLytDemoTitleMain_c::execute() { mLytBase.getLayout()->GetRootPane()->SetInfluencedAlpha(true); mLytBase.getLayout()->GetRootPane()->SetAlpha(255 - dStage_c::GetInstance()->getFader().getColorFaderAlpha()); @@ -146,12 +144,12 @@ bool dLytDemoTitleMain_c::fn_802B0860() { return true; } -bool dLytDemoTitleMain_c::fn_802B0950() { +bool dLytDemoTitleMain_c::draw() { mLytBase.addToDrawList(); return true; } -bool dLytDemoTitleMain_c::fn_802B0980() { +bool dLytDemoTitleMain_c::remove() { dStageMgr_c::GetInstance()->unsetFlags0x88a0(0xfffffffe); mLytBase.unbindAnims(); @@ -201,11 +199,11 @@ void dLytDemoTitleMain_c::fn_802B0BD0() { return; } -void dLytDemoTitle_c::initializeState_In() { +void dLytDemoTitle_c::initializeState_None() { return; } -void dLytDemoTitle_c::executeState_In() { +void dLytDemoTitle_c::executeState_None() { if (mIsAnimating) { mMain.fn_802B0A50(); mStateMgr.changeState(StateID_In); @@ -214,15 +212,15 @@ void dLytDemoTitle_c::executeState_In() { return; } -void dLytDemoTitle_c::finalizeState_In() { +void dLytDemoTitle_c::finalizeState_None() { return; } -void dLytDemoTitle_c::initializeState_Move() { +void dLytDemoTitle_c::initializeState_In() { return; } -void dLytDemoTitle_c::executeState_Move() { +void dLytDemoTitle_c::executeState_In() { if (mMain.getmIsAnimating()) { mMain.fn_802B0B00(); mStateMgr.changeState(StateID_Move); @@ -230,15 +228,15 @@ void dLytDemoTitle_c::executeState_Move() { return; } -void dLytDemoTitle_c::finalizeState_Move() { +void dLytDemoTitle_c::finalizeState_In() { return; } -void dLytDemoTitle_c::initializeState_Out() { +void dLytDemoTitle_c::initializeState_Move() { return; } -void dLytDemoTitle_c::executeState_Out() { +void dLytDemoTitle_c::executeState_Move() { if (mMain.getmIsAnimating() && field_0x58d) { mMain.fn_802B0B50(); mStateMgr.changeState(StateID_Out); @@ -247,15 +245,15 @@ void dLytDemoTitle_c::executeState_Out() { return; } -void dLytDemoTitle_c::finalizeState_Out() { +void dLytDemoTitle_c::finalizeState_Move() { return; } -void dLytDemoTitle_c::initializeState_End() { +void dLytDemoTitle_c::initializeState_Out() { return; } -void dLytDemoTitle_c::executeState_End() { +void dLytDemoTitle_c::executeState_Out() { if (mMain.getmIsAnimating()) { deleteRequest(); mMain.fn_802B0BD0(); @@ -265,34 +263,25 @@ void dLytDemoTitle_c::executeState_End() { return; } -void dLytDemoTitle_c::finalizeState_End() { +void dLytDemoTitle_c::finalizeState_Out() { return; } -void dLytDemoTitle_c::initializeState_None() { +void dLytDemoTitle_c::initializeState_End() { return; } -void dLytDemoTitle_c::executeState_None() { +void dLytDemoTitle_c::executeState_End() { return; } -void dLytDemoTitle_c::finalizeState_None() { +void dLytDemoTitle_c::finalizeState_End() { return; } SPECIAL_BASE_PROFILE(LYT_DEMO_TITLE, dLytDemoTitle_c, fProfile::LYT_DEMO_TITLE, 0x2BA, 0); -extern "C" char *lbl_805759D0; - -const d2d::LytBrlanMapping lbl_804EFAA0[] = { - { "in", "G_inOut_00" }, - { "loop", "G_loop_00" }, - { "out", "G_inOut_00" }, -}; - -bool dLytDemoTitle_c::build() { - d2d::LytBrlanMapping x = lbl_804EFAA0[0]; +int dLytDemoTitle_c::create() { sInstance = this; resAcc.attach(LayoutArcManager::GetInstance()->getLoadedData("DemoTitle"), ""); @@ -301,29 +290,29 @@ bool dLytDemoTitle_c::build() { mStateMgr.changeState(StateID_None); mIsAnimating = true; field_0x58d = false; - return true; + return SUCCEEDED; } -bool dLytDemoTitle_c::fn_802B1300() { +int dLytDemoTitle_c::execute() { if (*mStateMgr.getStateID() != StateID_None) { - mMain.fn_802B0860(); + mMain.execute(); } mStateMgr.executeState(); - return true; + return SUCCEEDED; } -bool dLytDemoTitle_c::fn_802B13A0() { +int dLytDemoTitle_c::draw() { if (*mStateMgr.getStateID() != StateID_None) { - mMain.fn_802B0950(); + mMain.draw(); } - return true; + return SUCCEEDED; } -bool dLytDemoTitle_c::fn_802B1410() { - mMain.fn_802B0980(); +int dLytDemoTitle_c::doDelete() { + mMain.remove(); resAcc.detach(); - lbl_805759D0 = 0; - return true; + sInstance = nullptr; + return SUCCEEDED; } -- cgit v1.2.3