Fixes

4 files changed, 53 insertions, 58 deletions

diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt
index 9e47132a..7d3f498f 100644
--- a/config/SOUE01/splits.txt
+++ b/config/SOUE01/splits.txt
@@ -1755,17 +1755,21 @@ d/lyt/d_lyt_deposit.cpp:
 d/lyt/d_lyt_demo_title.cpp:
 	.text       start:0x802B02D0 end:0x802B22E8 align:16
 	.ctors      start:0x804DB88C end:0x804DB890
-	.rodata     start:0x804EFA90 end:0x804EFAB8
+	.rodata     start:0x804EFA90 end:0x804EFAA0
 	.data       start:0x8053DFC8 end:0x8053E510
+	.sdata      start:0x80573C30 end:0x80573C38
 	.sbss       start:0x805759D0 end:0x805759D8
+	.sdata2     start:0x8057C7E0 end:0x8057C7E8
 	.bss        start:0x805B7120 end:0x805B73A0
 
 d/lyt/d_lyt_end_roll.cpp:
 	.text       start:0x802B22F0 end:0x802B6B98 align:16
 	.ctors      start:0x804DB890 end:0x804DB894
-	.rodata     start:0x804EFAB8 end:0x804EFAE0
+	.rodata     start:0x804EFAA0 end:0x804EFAE0
 	.data       start:0x8053E510 end:0x8053F0F8
+	.sdata      start:0x80573C38 end:0x80573C58
 	.sbss       start:0x805759D8 end:0x805759E0
+	.sdata2     start:0x8057C7E8 end:0x8057C818
 	.bss        start:0x805B73A0 end:0x805B7B20
 
 toBeSorted/d_a_bullet.cpp:
diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index 2249ee85..c0430980 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -4291,7 +4291,7 @@ __dt__10dFlowMgr_cFv = .text:0x800C4420; // type:function size:0x5C
 __ct__10dLytBase_cFv = .text:0x800C4480; // type:function size:0x54
 __dt__10dLytBase_cFv = .text:0x800C44E0; // type:function size:0x94
 allocateLytWork1Heap__10dLytBase_cFPCcb = .text:0x800C4580; // type:function size:0xB4
-fn_800C4640 = .text:0x800C4640; // type:function size:0x8
+build__10dLytBase_cFv = .text:0x800C4640; // type:function size:0x8
 removeLyt__10dLytBase_cFv = .text:0x800C4650; // type:function size:0x14
 fn_800C4670 = .text:0x800C4670; // type:function size:0x20
 fn_800C4690 = .text:0x800C4690; // type:function size:0x14
@@ -16160,10 +16160,10 @@ __dt__88sStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,
 __dt__35sFStateFct_c<19dLytDemoTitleMain_c>Fv = .text:0x802B0690; // type:function size:0x6C
 __dt__32sFState_c<19dLytDemoTitleMain_c>Fv = .text:0x802B0700; // type:function size:0x58
 build__19dLytDemoTitleMain_cFPQ23d2d10ResAccIf_c = .text:0x802B0760; // type:function size:0x100
-fn_802B0860__19dLytDemoTitleMain_cFv = .text:0x802B0860; // type:function size:0xD4
+execute__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
-fn_802B0980__19dLytDemoTitleMain_cFv = .text:0x802B0980; // type:function size:0x70
+draw__19dLytDemoTitleMain_cFv = .text:0x802B0950; // type:function size:0x28
+remove__19dLytDemoTitleMain_cFv = .text:0x802B0980; // type:function size:0x70
 fn_802B09F0__19dLytDemoTitleMain_cFv = .text:0x802B09F0; // type:function size:0x4C
 changeState__88sStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x802B0A40; // type:function size:0x10
 fn_802B0A50__19dLytDemoTitleMain_cFv = .text:0x802B0A50; // type:function size:0xA4
@@ -16192,12 +16192,12 @@ __dt__31sFStateFct_c<15dLytDemoTitle_c>Fv = .text:0x802B0FD0; // type:function s
 __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
-build__15dLytDemoTitle_cFv = .text:0x802B1270; // type:function size:0x88
-fn_802B1300__15dLytDemoTitle_cFv = .text:0x802B1300; // type:function size:0x7C
+create__15dLytDemoTitle_cFv = .text:0x802B1270; // type:function size:0x88
+execute__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
-fn_802B13A0__15dLytDemoTitle_cFv = .text:0x802B13A0; // type:function size:0x68
-fn_802B1410__15dLytDemoTitle_cFv = .text:0x802B1410; // type:function size:0x44
+draw__15dLytDemoTitle_cFv = .text:0x802B13A0; // type:function size:0x68
+doDelete__15dLytDemoTitle_cFv = .text:0x802B1410; // type:function size:0x44
 __dt__15dLytDemoTitle_cFv = .text:0x802B1460; // type:function size:0x16C
 build__31sFStateFct_c<15dLytDemoTitle_c>FRC12sStateIDIf_c = .text:0x802B15D0; // type:function size:0x60
 dispose__31sFStateFct_c<15dLytDemoTitle_c>FRP10sStateIf_c = .text:0x802B1630; // type:function size:0xC
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);
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;
 }