Fixing ctor and dtor

3 files changed, 32 insertions, 29 deletions

diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index fc8827be..2249ee85 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -16159,7 +16159,7 @@ __dt__58sFStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c>Fv = .text:0x8
 __dt__88sStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802B05F0; // type:function size:0xA0
 __dt__35sFStateFct_c<19dLytDemoTitleMain_c>Fv = .text:0x802B0690; // type:function size:0x6C
 __dt__32sFState_c<19dLytDemoTitleMain_c>Fv = .text:0x802B0700; // type:function size:0x58
-fn_802B0760__19dLytDemoTitleMain_cFPQ23d2d10ResAccIf_c = .text:0x802B0760; // type:function size:0x100
+build__19dLytDemoTitleMain_cFPQ23d2d10ResAccIf_c = .text:0x802B0760; // type:function size:0x100
 fn_802B0860__19dLytDemoTitleMain_cFv = .text:0x802B0860; // type:function size:0xD4
 executeState__88sStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802B0940; // type:function size:0x10
 fn_802B0950__19dLytDemoTitleMain_cFv = .text:0x802B0950; // type:function size:0x28
@@ -16186,13 +16186,13 @@ finalizeState_End__15dLytDemoTitle_cFv = .text:0x802B0E30; // type:function size
 initializeState_None__15dLytDemoTitle_cFv = .text:0x802B0E40; // type:function size:0x4
 executeState_None__15dLytDemoTitle_cFv = .text:0x802B0E50; // type:function size:0x4
 finalizeState_None__15dLytDemoTitle_cFv = .text:0x802B0E60; // type:function size:0x4
-__ct__15dLytDemoTitle_cFv = .text:0x802B0E70; // type:function size:0xF4
+dLytDemoTitle_c_classInit__Fv = .text:0x802B0E70; // type:function size:0xF4
 __dt__28sFState_c<15dLytDemoTitle_c>Fv = .text:0x802B0F70; // type:function size:0x58
 __dt__31sFStateFct_c<15dLytDemoTitle_c>Fv = .text:0x802B0FD0; // type:function size:0x6C
 __dt__84sStateMgr_c<15dLytDemoTitle_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802B1040; // type:function size:0xA0
 __dt__54sFStateMgr_c<15dLytDemoTitle_c,20sStateMethodUsr_FI_c>Fv = .text:0x802B10E0; // type:function size:0xA4
 __dt__19dLytDemoTitleMain_cFv = .text:0x802B1190; // type:function size:0xD8
-fn_802B1270__15dLytDemoTitle_cFv = .text:0x802B1270; // type:function size:0x88
+build__15dLytDemoTitle_cFv = .text:0x802B1270; // type:function size:0x88
 fn_802B1300__15dLytDemoTitle_cFv = .text:0x802B1300; // type:function size:0x7C
 getStateID__84sStateMgr_c<15dLytDemoTitle_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802B1380; // type:function size:0x10
 executeState__84sStateMgr_c<15dLytDemoTitle_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802B1390; // type:function size:0x10
@@ -37640,14 +37640,14 @@ __vt__28sFStateID_c<13dLytDeposit_c> = .data:0x8053DF90; // type:object size:0x3
 @25669 = .data:0x8053E004; // type:object size:0x13 data:string
 g_profile_LYT_DEMO_TITLE = .data:0x8053E018; // type:object size:0xC
 @25833 = .data:0x8053E024; // type:object size:0xA data:string
-lbl_8053E030 = .data:0x8053E030; // type:object size:0x50
-lbl_8053E080 = .data:0x8053E080; // type:object size:0x30
-lbl_8053E0B0 = .data:0x8053E0B0; // type:object size:0x30
+__vt__15dLytDemoTitle_c = .data:0x8053E030; // type:object size:0x50
+__vt__54sFStateMgr_c<15dLytDemoTitle_c,20sStateMethodUsr_FI_c> = .data:0x8053E080; // type:object size:0x30
+__vt__84sStateMgr_c<15dLytDemoTitle_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x8053E0B0; // type:object size:0x30
 lbl_8053E0E0 = .data:0x8053E0E0; // type:object size:0x18
-lbl_8053E0F8 = .data:0x8053E0F8; // type:object size:0x18
+__vt__28sFState_c<15dLytDemoTitle_c> = .data:0x8053E0F8; // type:object size:0x18
 lbl_8053E110 = .data:0x8053E110; // type:object size:0x10
-lbl_8053E120 = .data:0x8053E120; // type:object size:0x30
-lbl_8053E150 = .data:0x8053E150; // type:object size:0x30
+__vt__58sFStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c> = .data:0x8053E120; // type:object size:0x30
+__vt__88sStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x8053E150; // type:object size:0x30
 lbl_8053E180 = .data:0x8053E180; // type:object size:0x18
 lbl_8053E198 = .data:0x8053E198; // type:object size:0x30C
 lbl_8053E4A4 = .data:0x8053E4A4; // type:object size:0x34
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;
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() {}