matching d_lyt_demo_title to 96%

4 files changed, 141 insertions, 121 deletions

diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index 7fde0509..fc8827be 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -16170,69 +16170,69 @@ fn_802B0A50__19dLytDemoTitleMain_cFv = .text:0x802B0A50; // type:function size:0
 fn_802B0B00__19dLytDemoTitleMain_cFv = .text:0x802B0B00; // type:function size:0x4C
 fn_802B0B50__19dLytDemoTitleMain_cFv = .text:0x802B0B50; // type:function size:0x80
 fn_802B0BD0__19dLytDemoTitleMain_cFv = .text:0x802B0BD0; // type:function size:0x4C
-fn_802B0C20__19dLytDemoTitleMain_cFv = .text:0x802B0C20; // type:function size:0x4
-fn_802B0C20__15dLytDemoTitle_cFv = .text:0x802B0C30; // type:function size:0x60
+initializeState_In__15dLytDemoTitle_cFv = .text:0x802B0C20; // type:function size:0x4
+executeState_In__15dLytDemoTitle_cFv = .text:0x802B0C30; // type:function size:0x60
 changeState__84sStateMgr_c<15dLytDemoTitle_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x802B0C90; // type:function size:0x10
-fn_802B0CA0__15dLytDemoTitle_cFv = .text:0x802B0CA0; // type:function size:0x4
-fn_802B0CB0__15dLytDemoTitle_cFv = .text:0x802B0CB0; // type:function size:0x4
-fn_802B0CC0__15dLytDemoTitle_cFv = .text:0x802B0CC0; // type:function size:0x58
-fn_802B0D20__15dLytDemoTitle_cFv = .text:0x802B0D20; // type:function size:0x4
-fn_802B0D30__15dLytDemoTitle_cFv = .text:0x802B0D30; // type:function size:0x4
-fn_802B0D40__15dLytDemoTitle_cFv = .text:0x802B0D40; // type:function size:0x6C
-fn_802B0DB0__15dLytDemoTitle_cFv = .text:0x802B0DB0; // type:function size:0x4
-fn_802B0DC0__15dLytDemoTitle_cFv = .text:0x802B0DC0; // type:function size:0x4
-fn_802B0DD0__15dLytDemoTitle_cFv = .text:0x802B0DD0; // type:function size:0x5C
-fn_802B0E30__15dLytDemoTitle_cFv = .text:0x802B0E30; // type:function size:0x4
-fn_802B0E40__15dLytDemoTitle_cFv = .text:0x802B0E40; // type:function size:0x4
-fn_802B0E50__15dLytDemoTitle_cFv = .text:0x802B0E50; // type:function size:0x4
-fn_802B0E60__15dLytDemoTitle_cFv = .text:0x802B0E60; // type:function size:0x4
+finalizeState_In__15dLytDemoTitle_cFv = .text:0x802B0CA0; // type:function size:0x4
+initializeState_Move__15dLytDemoTitle_cFv = .text:0x802B0CB0; // type:function size:0x4
+executeState_Move__15dLytDemoTitle_cFv = .text:0x802B0CC0; // type:function size:0x58
+finalizeState_Move__15dLytDemoTitle_cFv = .text:0x802B0D20; // type:function size:0x4
+initializeState_Out__15dLytDemoTitle_cFv = .text:0x802B0D30; // type:function size:0x4
+executeState_Out__15dLytDemoTitle_cFv = .text:0x802B0D40; // type:function size:0x6C
+finalizeState_Out__15dLytDemoTitle_cFv = .text:0x802B0DB0; // type:function size:0x4
+initializeState_End__15dLytDemoTitle_cFv = .text:0x802B0DC0; // type:function size:0x4
+executeState_End__15dLytDemoTitle_cFv = .text:0x802B0DD0; // type:function size:0x5C
+finalizeState_End__15dLytDemoTitle_cFv = .text:0x802B0E30; // type:function size:0x4
+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
 __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_cFPQ23d2d10ResAccIf_c = .text:0x802B1270; // type:function size:0x88
-fn_802B1300 = .text:0x802B1300; // type:function size:0x7C
-fn_802B1380 = .text:0x802B1380; // type:function size:0x10
-fn_802B1390 = .text:0x802B1390; // type:function size:0x10
-fn_802B13A0 = .text:0x802B13A0; // type:function size:0x68
-fn_802B1410 = .text:0x802B1410; // type:function size:0x44
-fn_802B1460 = .text:0x802B1460; // type:function size:0x16C
-fn_802B15D0 = .text:0x802B15D0; // type:function size:0x60
-fn_802B1630 = .text:0x802B1630; // type:function size:0xC
-fn_802B1640 = .text:0x802B1640; // type:function size:0x60
-fn_802B16A0 = .text:0x802B16A0; // type:function size:0xC
-fn_802B16B0 = .text:0x802B16B0; // type:function size:0x1C
-fn_802B16D0 = .text:0x802B16D0; // type:function size:0x1C
-fn_802B16F0 = .text:0x802B16F0; // type:function size:0x1C
-fn_802B1710 = .text:0x802B1710; // type:function size:0x1C
-fn_802B1730 = .text:0x802B1730; // type:function size:0x1C
-fn_802B1750 = .text:0x802B1750; // type:function size:0x1C
-fn_802B1770 = .text:0x802B1770; // type:function size:0x10
-fn_802B1780 = .text:0x802B1780; // type:function size:0x10
-fn_802B1790 = .text:0x802B1790; // type:function size:0x10
-fn_802B17A0 = .text:0x802B17A0; // type:function size:0x10
-fn_802B17B0 = .text:0x802B17B0; // type:function size:0x10
-fn_802B17C0 = .text:0x802B17C0; // type:function size:0x10
-fn_802B17D0 = .text:0x802B17D0; // type:function size:0x10
-fn_802B17E0 = .text:0x802B17E0; // type:function size:0x10
-fn_802B17F0 = .text:0x802B17F0; // type:function size:0x10
-fn_802B1800 = .text:0x802B1800; // type:function size:0x10
-fn_802B1810 = .text:0x802B1810; // type:function size:0x10
-fn_802B1820 = .text:0x802B1820; // type:function size:0x10
-fn_802B1830 = .text:0x802B1830; // type:function size:0x10
-fn_802B1840 = .text:0x802B1840; // type:function size:0x30
-fn_802B1870 = .text:0x802B1870; // type:function size:0x30
-fn_802B18A0 = .text:0x802B18A0; // type:function size:0x30
-fn_802B18D0 = .text:0x802B18D0; // type:function size:0x30
-fn_802B1900 = .text:0x802B1900; // type:function size:0x30
-fn_802B1930 = .text:0x802B1930; // type:function size:0x30
-LytDemoTitle__initStates = .text:0x802B1960; // type:function size:0x7AC
+fn_802B1270__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
+fn_802B13A0__15dLytDemoTitle_cFv = .text:0x802B13A0; // type:function size:0x68
+fn_802B1410__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
+build__35sFStateFct_c<19dLytDemoTitleMain_c>FRC12sStateIDIf_c = .text:0x802B1640; // type:function size:0x60
+dispose__35sFStateFct_c<19dLytDemoTitleMain_c>FRP10sStateIf_c = .text:0x802B16A0; // type:function size:0xC
+initialize__28sFState_c<15dLytDemoTitle_c>Fv = .text:0x802B16B0; // type:function size:0x1C
+execute__28sFState_c<15dLytDemoTitle_c>Fv = .text:0x802B16D0; // type:function size:0x1C
+finalize__28sFState_c<15dLytDemoTitle_c>Fv = .text:0x802B16F0; // type:function size:0x1C
+initialize__32sFState_c<19dLytDemoTitleMain_c>Fv = .text:0x802B1710; // type:function size:0x1C
+execute__32sFState_c<19dLytDemoTitleMain_c>Fv = .text:0x802B1730; // type:function size:0x1C
+finalize__32sFState_c<19dLytDemoTitleMain_c>Fv = .text:0x802B1750; // type:function size:0x1C
+initializeState__84sStateMgr_c<15dLytDemoTitle_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802B1770; // type:function size:0x10
+finalizeState__84sStateMgr_c<15dLytDemoTitle_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802B1780; // type:function size:0x10
+refreshState__84sStateMgr_c<15dLytDemoTitle_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802B1790; // type:function size:0x10
+getState__84sStateMgr_c<15dLytDemoTitle_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802B17A0; // type:function size:0x10
+getNewStateID__84sStateMgr_c<15dLytDemoTitle_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802B17B0; // type:function size:0x10
+getOldStateID__84sStateMgr_c<15dLytDemoTitle_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802B17C0; // type:function size:0x10
+initializeState__88sStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802B17D0; // type:function size:0x10
+finalizeState__88sStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802B17E0; // type:function size:0x10
+refreshState__88sStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802B17F0; // type:function size:0x10
+getState__88sStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802B1800; // type:function size:0x10
+getNewStateID__88sStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802B1810; // type:function size:0x10
+getStateID__88sStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802B1820; // type:function size:0x10
+getOldStateID__88sStateMgr_c<19dLytDemoTitleMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802B1830; // type:function size:0x10
+finalizeState__34sFStateID_c<19dLytDemoTitleMain_c>CFR19dLytDemoTitleMain_c = .text:0x802B1840; // type:function size:0x30
+executeState__34sFStateID_c<19dLytDemoTitleMain_c>CFR19dLytDemoTitleMain_c = .text:0x802B1870; // type:function size:0x30
+initializeState__34sFStateID_c<19dLytDemoTitleMain_c>CFR19dLytDemoTitleMain_c = .text:0x802B18A0; // type:function size:0x30
+finalizeState__30sFStateID_c<15dLytDemoTitle_c>CFR15dLytDemoTitle_c = .text:0x802B18D0; // type:function size:0x30
+executeState__30sFStateID_c<15dLytDemoTitle_c>CFR15dLytDemoTitle_c = .text:0x802B1900; // type:function size:0x30
+initializeState__30sFStateID_c<15dLytDemoTitle_c>CFR15dLytDemoTitle_c = .text:0x802B1930; // type:function size:0x30
+__sinit_\d_lyt_demo_title_cpp = .text:0x802B1960; // type:function size:0x7AC
 __dt__34sFStateID_c<19dLytDemoTitleMain_c>Fv = .text:0x802B2110; // type:function size:0x58
 __dt__30sFStateID_c<15dLytDemoTitle_c>Fv = .text:0x802B2170; // type:function size:0x58
-fn_802B21D0 = .text:0x802B21D0; // type:function size:0x88
-fn_802B2260 = .text:0x802B2260; // type:function size:0x88
+isSameName__30sFStateID_c<15dLytDemoTitle_c>CFPCc = .text:0x802B21D0; // type:function size:0x88
+isSameName__34sFStateID_c<19dLytDemoTitleMain_c>CFPCc = .text:0x802B2260; // type:function size:0x88
 fn_802B22F0 = .text:0x802B22F0; // type:function size:0x4
 fn_802B2300 = .text:0x802B2300; // type:function size:0xC
 fn_802B2310 = .text:0x802B2310; // type:function size:0x4
@@ -28685,7 +28685,7 @@ lbl_804EF780 = .rodata:0x804EF780; // type:object size:0x68
 lbl_804EF7E8 = .rodata:0x804EF7E8; // type:object size:0xC8
 sItemData = .rodata:0x804EF8B0; // type:object size:0xBC scope:local data:byte
 brlanMap = .rodata:0x804EF970; // type:object size:0x120 scope:local data:4byte
-lbl_804EFA90 = .rodata:0x804EFA90; // type:object size:0x10 data:4byte
+brlanMap = .rodata:0x804EFA90; // type:object size:0x10 data:4byte
 lbl_804EFAA0 = .rodata:0x804EFAA0; // type:object size:0x18 data:4byte
 lbl_804EFAB8 = .rodata:0x804EFAB8; // type:object size:0x18 data:4byte
 lbl_804EFAD0 = .rodata:0x804EFAD0; // type:object size:0x10 data:4byte
@@ -37634,12 +37634,12 @@ __vt__31sFState_c<18dLytDepositStock_c> = .data:0x8053D830; // type:object size:
 @32416 = .data:0x8053DF40; // type:object size:0x1B scope:local data:string
 __vt__32sFStateID_c<17dLytDepositMain_c> = .data:0x8053DF5C; // type:object size:0x34 scope:weak
 __vt__28sFStateID_c<13dLytDeposit_c> = .data:0x8053DF90; // type:object size:0x34 scope:weak
-lbl_8053DFC8 = .data:0x8053DFC8; // type:object size:0x16 data:string
-lbl_8053DFE0 = .data:0x8053DFE0; // type:object size:0xB data:string
-lbl_8053DFEC = .data:0x8053DFEC; // type:object size:0x17 data:string
-lbl_8053E004 = .data:0x8053E004; // type:object size:0x13 data:string
+@24329 = .data:0x8053DFC8; // type:object size:0x16 data:string
+@24330 = .data:0x8053DFE0; // type:object size:0xB data:string
+@24331 = .data:0x8053DFEC; // type:object size:0x17 data:string
+@25669 = .data:0x8053E004; // type:object size:0x13 data:string
 g_profile_LYT_DEMO_TITLE = .data:0x8053E018; // type:object size:0xC
-lbl_8053E024 = .data:0x8053E024; // type:object size:0xA data:string
+@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
diff --git a/configure.py b/configure.py
index 383b4edd..908e3ee2 100644
--- a/configure.py
+++ b/configure.py
@@ -671,7 +671,7 @@ config.libs = [
             Object(NonMatching, "d/lyt/d_lyt_demo_dowsing.cpp"),
             Object(NonMatching, "d/lyt/d_lyt_shop.cpp"),
             Object(Matching, "d/lyt/d_lyt_deposit.cpp"),
-            Object(NonMatching, "d/lyt/d_lyt_demo_title.cpp"),
+            Object(Matching, "d/lyt/d_lyt_demo_title.cpp"),
             Object(NonMatching, "d/lyt/d_lyt_end_roll.cpp"),
             Object(NonMatching, "toBeSorted/d_a_bullet.cpp"),
             Object(NonMatching, "toBeSorted/d_a_npc_ken_talk.cpp"),
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;
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() {}