start with dLyt stuff, dLytFader_c

zeldaret · Sep 13, 2024 · 36450cb · 36450cb
1 parent 4c6262a
commit 36450cb
Show file tree

Hide file tree

Showing 19 changed files with 573 additions and 68 deletions.
diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt
@@ -154,6 +154,9 @@ toBeSorted/dowsing_target.cpp:
 	.sdata2     start:0x80579640 end:0x80579670
 	.bss        start:0x805A2FB0 end:0x805A3010
 
+toBeSorted/lyt/d2d.cpp:
+	.text       start:0x800A9D30 end:0x800ACAB8
+
 toBeSorted/sceneflag_manager.cpp:
 	.text       start:0x800BD8C0 end:0x800BE7A8
 	.sbss       start:0x805753E0 end:0x805753F0
@@ -188,6 +191,11 @@ toBeSorted/special_item_drop_mgr.cpp:
 	.text       start:0x800C7B60 end:0x800C82B0
 	.sbss       start:0x80575438 end:0x80575440
 
+toBeSorted/lyt/pause_disp_00.cpp:
+	.text       start:0x80159E80 end:0x8015EDE8
+	.ctors      start:0x804DB798 end:0x804DB79C
+	.data       start:0x80525138 end:0x80525EE0
+
 toBeSorted/counters/counter.cpp:
 	.text       start:0x8016CC40 end:0x8016CD94
 
@@ -234,6 +242,13 @@ toBeSorted/counters/extra_wallet_counter.cpp:
 	.data       start:0x805280B0 end:0x805280D0
 	.sbss       start:0x80575640 end:0x80575648
 
+toBeSorted/lyt/d_lyt_fader.cpp:
+	.text       start:0x801753A0 end:0x80175BD0
+	.rodata     start:0x804E9AB8 end:0x804E9AD0
+	.data       start:0x80528CC8 end:0x80528D68
+	.sdata      start:0x80572AA8 end:0x80572AB0
+	.sdata2     start:0x8057ABC8 end:0x8057ABE0
+
 s/s_StateID.cpp:
 	.text       start:0x802DDDB0 end:0x802DE1F4
 	.ctors      start:0x804DB8B8 end:0x804DB8BC

diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
@@ -445,7 +445,7 @@ fn_80011AF0 = .text:0x80011AF0; // type:function size:0xA4
 fn_80011BA0 = .text:0x80011BA0; // type:function size:0xA0
 fn_80011C40 = .text:0x80011C40; // type:function size:0x6C
 fn_80011CB0 = .text:0x80011CB0; // type:function size:0x58
-fn_80011D10 = .text:0x80011D10; // type:function size:0x5C
+__dt__Q23d2d11dLytStructAFv = .text:0x80011D10; // type:function size:0x5C
 fn_80011D70 = .text:0x80011D70; // type:function size:0x40
 fn_80011DB0 = .text:0x80011DB0; // type:function size:0x58
 fn_80011E10 = .text:0x80011E10; // type:function size:0xA4
@@ -455,7 +455,7 @@ fn_80011FD0 = .text:0x80011FD0; // type:function size:0x58
 fn_80012030 = .text:0x80012030; // type:function size:0x40
 fn_80012070 = .text:0x80012070; // type:function size:0x40
 fn_800120B0 = .text:0x800120B0; // type:function size:0x74
-fn_80012130 = .text:0x80012130; // type:function size:0x40
+__dt__Q34nw4r3lyt11FontRefLinkFv = .text:0x80012130; // type:function size:0x40
 fn_80012170 = .text:0x80012170; // type:function size:0xA4
 fn_80012220 = .text:0x80012220; // type:function size:0xA0
 fn_800122C0 = .text:0x800122C0; // type:function size:0x6C
@@ -3723,8 +3723,8 @@ fn_800A9AB0 = .text:0x800A9AB0; // type:function size:0x50
 fn_800A9B00 = .text:0x800A9B00; // type:function size:0xC4
 fn_800A9BD0 = .text:0x800A9BD0; // type:function size:0x78
 fn_800A9C50 = .text:0x800A9C50; // type:function size:0xD4
-fn_800A9D30 = .text:0x800A9D30; // type:function size:0x60
-fn_800A9D90 = .text:0x800A9D90; // type:function size:0x90
+fn_800A9D30__20dLytFontRefAndAccessFv = .text:0x800A9D30; // type:function size:0x60
+fn_800A9D90__20dLytFontRefAndAccessFPvPCc = .text:0x800A9D90; // type:function size:0x90
 fn_800A9E20 = .text:0x800A9E20; // type:function size:0x12C
 fn_800A9F50 = .text:0x800A9F50; // type:function size:0x60
 fn_800A9FB0 = .text:0x800A9FB0; // type:function size:0x60
@@ -3735,8 +3735,8 @@ fn_800AA120 = .text:0x800AA120; // type:function size:0x2F4
 fn_800AA420 = .text:0x800AA420; // type:function size:0x60
 fn_800AA480 = .text:0x800AA480; // type:function size:0x58
 fn_800AA4E0 = .text:0x800AA4E0; // type:function size:0x50
-fn_800AA530 = .text:0x800AA530; // type:function size:0xD0
-fn_800AA600 = .text:0x800AA600; // type:function size:0x58
+__ct__Q23d2d7Multi_cFv = .text:0x800AA530; // type:function size:0xD0
+__dt__Q23d2d8Layout_cFv = .text:0x800AA600; // type:function size:0x58
 fn_800AA660 = .text:0x800AA660; // type:function size:0x24
 fn_800AA690 = .text:0x800AA690; // type:function size:0x34
 fn_800AA6D0 = .text:0x800AA6D0; // type:function size:0x24
@@ -3746,10 +3746,10 @@ fn_800AA900 = .text:0x800AA900; // type:function size:0x108
 fn_800AAA10 = .text:0x800AAA10; // type:function size:0x18
 fn_800AAA30 = .text:0x800AAA30; // type:function size:0x94
 fn_800AAAD0 = .text:0x800AAAD0; // type:function size:0x94
-fn_800AAB70 = .text:0x800AAB70; // type:function size:0x10
-fn_800AAB80 = .text:0x800AAB80; // type:function size:0x44
-fn_800AABD0 = .text:0x800AABD0; // type:function size:0x78
-fn_800AAC50 = .text:0x800AAC50; // type:function size:0xA0
+fn_800AAB70__Q23d2d9LytBase_cFv = .text:0x800AAB70; // type:function size:0x10
+__ct__Q23d2d9LytBase_cFv = .text:0x800AAB80; // type:function size:0x44
+__dt__Q23d2d7Multi_cFv = .text:0x800AABD0; // type:function size:0x78
+__dt__Q23d2d9LytBase_cFv = .text:0x800AAC50; // type:function size:0xA0
 fn_800AACF0 = .text:0x800AACF0; // type:function size:0x2F8
 fn_800AAFF0 = .text:0x800AAFF0; // type:function size:0x100
 fn_800AB0F0 = .text:0x800AB0F0; // type:function size:0x94
@@ -3771,20 +3771,20 @@ fn_800AC350 = .text:0x800AC350; // type:function size:0x64
 fn_800AC3C0 = .text:0x800AC3C0; // type:function size:0x128
 fn_800AC4F0 = .text:0x800AC4F0; // type:function size:0x8
 fn_800AC500 = .text:0x800AC500; // type:function size:0x8
-fn_800AC510 = .text:0x800AC510; // type:function size:0x9C
+init__Q23d2d11dLytStructAFPCcPQ23m2d10ResAccIf_cPQ23d2d8Layout_cPCc = .text:0x800AC510; // type:function size:0x9C
 fn_800AC5B0 = .text:0x800AC5B0; // type:function size:0x114
-fn_800AC6D0 = .text:0x800AC6D0; // type:function size:0xF8
+fn_800AC6D0__Q23d2d11dLytStructAFb = .text:0x800AC6D0; // type:function size:0xF8
 fn_800AC7D0 = .text:0x800AC7D0; // type:function size:0x88
-fn_800AC860 = .text:0x800AC860; // type:function size:0x8
-fn_800AC870 = .text:0x800AC870; // type:function size:0x8C
+fn_800AC860__Q23d2d11dLytStructAFv = .text:0x800AC860; // type:function size:0x8
+fn_800AC780__Q23d2d11dLytStructAFb = .text:0x800AC870; // type:function size:0x8C
 fn_800AC900 = .text:0x800AC900; // type:function size:0xC
-fn_800AC910 = .text:0x800AC910; // type:function size:0xC
+fn_800AC910__Q23d2d11dLytStructAFv = .text:0x800AC910; // type:function size:0xC
 fn_800AC920 = .text:0x800AC920; // type:function size:0x14
 fn_800AC940 = .text:0x800AC940; // type:function size:0x14
 fn_800AC960 = .text:0x800AC960; // type:function size:0x4C
 fn_800AC9B0 = .text:0x800AC9B0; // type:function size:0x80
 fn_800ACA30 = .text:0x800ACA30; // type:function size:0x64
-fn_800ACAA0 = .text:0x800ACAA0; // type:function size:0x18
+draw__Q23d2d9LytBase_cFv = .text:0x800ACAA0; // type:function size:0x18
 fn_800ACAC0 = .text:0x800ACAC0; // type:function size:0x5C
 fn_800ACB20 = .text:0x800ACB20; // type:function size:0x40
 fn_800ACB60 = .text:0x800ACB60; // type:function size:0x208
@@ -4503,7 +4503,7 @@ fn_800CA0A0 = .text:0x800CA0A0; // type:function size:0x1C
 fn_800CA0C0 = .text:0x800CA0C0; // type:function size:0x38
 fn_800CA100 = .text:0x800CA100; // type:function size:0x1C0
 fn_800CA2C0 = .text:0x800CA2C0; // type:function size:0x6C
-fn_800CA330 = .text:0x800CA330; // type:function size:0x84
+__ct__Q23d2d11dLytStructAFv = .text:0x800CA330; // type:function size:0x84
 fn_800CA3C0 = .text:0x800CA3C0; // type:function size:0x110
 fn_800CA4D0 = .text:0x800CA4D0; // type:function size:0x58
 fn_800CA530 = .text:0x800CA530; // type:function size:0x6C
@@ -8778,12 +8778,12 @@ fn_80159A20 = .text:0x80159A20; // type:function size:0x30
 fn_80159A50 = .text:0x80159A50; // type:function size:0x338
 fn_80159D90 = .text:0x80159D90; // type:function size:0x58
 fn_80159DF0 = .text:0x80159DF0; // type:function size:0x88
-fn_80159E80 = .text:0x80159E80; // type:function size:0x160
-fn_80159FE0 = .text:0x80159FE0; // type:function size:0xA4
-fn_8015A090 = .text:0x8015A090; // type:function size:0xA0
-fn_8015A130 = .text:0x8015A130; // type:function size:0x6C
-fn_8015A1A0 = .text:0x8015A1A0; // type:function size:0x58
-fn_8015A200 = .text:0x8015A200; // type:function size:0x310
+__ct__17dLytPauseDisp00_cFv = .text:0x80159E80; // type:function size:0x160
+__dt__56sFStateMgr_c<17dLytPauseDisp00_c,20sStateMethodUsr_FI_c>Fv = .text:0x80159FE0; // type:function size:0xA4
+__dt__86sStateMgr_c<17dLytPauseDisp00_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x8015A090; // type:function size:0xA0
+__dt__33sFStateFct_c<17dLytPauseDisp00_c>Fv = .text:0x8015A130; // type:function size:0x6C
+__dt__30sFState_c<17dLytPauseDisp00_c>Fv = .text:0x8015A1A0; // type:function size:0x58
+init__17dLytPauseDisp00_cFv = .text:0x8015A200; // type:function size:0x310
 fn_8015A510 = .text:0x8015A510; // type:function size:0x10
 fn_8015A520 = .text:0x8015A520; // type:function size:0x118
 fn_8015A640 = .text:0x8015A640; // type:function size:0x10C
@@ -8819,7 +8819,7 @@ fn_8015BD40 = .text:0x8015BD40; // type:function size:0x4
 fn_8015BD50 = .text:0x8015BD50; // type:function size:0x94
 fn_8015BDF0 = .text:0x8015BDF0; // type:function size:0xE0
 fn_8015BED0 = .text:0x8015BED0; // type:function size:0x4
-fn_8015BEE0 = .text:0x8015BEE0; // type:function size:0x68
+displayElement__17dLytPauseDisp00_cFif = .text:0x8015BEE0; // type:function size:0x68
 fn_8015BF50 = .text:0x8015BF50; // type:function size:0x10
 fn_8015BF60 = .text:0x8015BF60; // type:function size:0x64
 fn_8015BFD0 = .text:0x8015BFD0; // type:function size:0x160
@@ -8843,7 +8843,7 @@ fn_8015E070 = .text:0x8015E070; // type:function size:0x220
 fn_8015E290 = .text:0x8015E290; // type:function size:0xA4
 fn_8015E340 = .text:0x8015E340; // type:function size:0x54
 fn_8015E3A0 = .text:0x8015E3A0; // type:function size:0xF4
-fn_8015E4A0 = .text:0x8015E4A0; // type:function size:0x130
+__dt__17dLytPauseDisp00_cFv = .text:0x8015E4A0; // type:function size:0x130
 fn_8015E5D0 = .text:0x8015E5D0; // type:function size:0x60
 fn_8015E630 = .text:0x8015E630; // type:function size:0xC
 fn_8015E640 = .text:0x8015E640; // type:function size:0x1C
@@ -8858,7 +8858,7 @@ fn_8015E6F0 = .text:0x8015E6F0; // type:function size:0x10
 fn_8015E700 = .text:0x8015E700; // type:function size:0x30
 fn_8015E730 = .text:0x8015E730; // type:function size:0x30
 fn_8015E760 = .text:0x8015E760; // type:function size:0x30
-fn_8015E790 = .text:0x8015E790; // type:function size:0x56C
+__sinit_\pause_disp_00_cpp = .text:0x8015E790; // type:function size:0x56C scope:local
 fn_8015ED00 = .text:0x8015ED00; // type:function size:0x58
 fn_8015ED60 = .text:0x8015ED60; // type:function size:0x88
 fn_8015EDF0 = .text:0x8015EDF0; // type:function size:0x160
@@ -9816,19 +9816,19 @@ fn_80175290 = .text:0x80175290; // type:function size:0x4
 fn_801752A0 = .text:0x801752A0; // type:function size:0x8
 fn_801752B0 = .text:0x801752B0; // type:function size:0x4C
 fn_80175300 = .text:0x80175300; // type:function size:0x9C
-fn_801753A0 = .text:0x801753A0; // type:function size:0xAC
-fn_80175450 = .text:0x80175450; // type:function size:0x100
-fn_80175550 = .text:0x80175550; // type:function size:0x140
-fn_80175690 = .text:0x80175690; // type:function size:0x70
-fn_80175700 = .text:0x80175700; // type:function size:0x4C
-fn_80175750 = .text:0x80175750; // type:function size:0x4C
-fn_801757A0 = .text:0x801757A0; // type:function size:0x4C
-fn_801757F0 = .text:0x801757F0; // type:function size:0xF4
-fn_801758F0 = .text:0x801758F0; // type:function size:0xB8
-fn_801759B0 = .text:0x801759B0; // type:function size:0x94
-fn_80175A50 = .text:0x80175A50; // type:function size:0xB8
-fn_80175B10 = .text:0x80175B10; // type:function size:0xA4
-fn_80175BC0 = .text:0x80175BC0; // type:function size:0x10
+__ct__11dLytFader_cFRC6mColorQ212mFaderBase_c7EStatus = .text:0x801753A0; // type:function size:0xAC
+__dt__11dLytFader_cFv = .text:0x80175450; // type:function size:0x100
+setStatus__11dLytFader_cFQ212mFaderBase_c7EStatus = .text:0x80175550; // type:function size:0x140
+calc__11dLytFader_cFv = .text:0x80175690; // type:function size:0x70
+draw__11dLytFader_cFv = .text:0x80175700; // type:function size:0x4C
+fadeIn__11dLytFader_cFv = .text:0x80175750; // type:function size:0x4C
+fadeOut__11dLytFader_cFv = .text:0x801757A0; // type:function size:0x4C
+init__11dLytFader_cFv = .text:0x801757F0; // type:function size:0xF4
+fn_801758F0__11dLytFader_cFv = .text:0x801758F0; // type:function size:0xB8
+fn_801759B0__11dLytFader_cFv = .text:0x801759B0; // type:function size:0x94
+fn_80175A50__11dLytFader_cFv = .text:0x80175A50; // type:function size:0xB8
+fn_80175B10__11dLytFader_cFv = .text:0x80175B10; // type:function size:0xA4
+fn_80175BC0__11dLytFader_cFl = .text:0x80175BC0; // type:function size:0x10
 fn_80175BD0 = .text:0x80175BD0; // type:function size:0x44
 fn_80175C20 = .text:0x80175C20; // type:function size:0x58
 fn_80175C80 = .text:0x80175C80; // type:function size:0x74
@@ -28367,7 +28367,7 @@ lbl_804E9A48 = .rodata:0x804E9A48; // type:object size:0x38 data:2byte
 lbl_804E9A80 = .rodata:0x804E9A80; // type:object size:0x18 data:2byte
 lbl_804E9A98 = .rodata:0x804E9A98; // type:object size:0x10
 lbl_804E9AA8 = .rodata:0x804E9AA8; // type:object size:0x10
-lbl_804E9AB8 = .rodata:0x804E9AB8; // type:object size:0x18 data:4byte
+lbl_804E9AB8 = .rodata:0x804E9AB8; // type:object size:0x18 scope:local data:4byte
 lbl_804E9AD0 = .rodata:0x804E9AD0; // type:object size:0x10 data:4byte
 lbl_804E9AE0 = .rodata:0x804E9AE0; // type:object size:0x18 data:4byte
 lbl_804E9AF8 = .rodata:0x804E9AF8; // type:object size:0xA4 data:4byte
@@ -30931,9 +30931,9 @@ lbl_8050FF98 = .data:0x8050FF98; // type:object size:0x10
 lbl_8050FFA8 = .data:0x8050FFA8; // type:object size:0x10 data:string
 lbl_8050FFB8 = .data:0x8050FFB8; // type:object size:0x10
 lbl_8050FFC8 = .data:0x8050FFC8; // type:object size:0x48
-lbl_80510010 = .data:0x80510010; // type:object size:0x1C
-lbl_8051002C = .data:0x8051002C; // type:object size:0x1C
-lbl_80510048 = .data:0x80510048; // type:object size:0x40
+__vt__Q23d2d9LytBase_c = .data:0x80510010; // type:object size:0x1C
+__vt__Q23d2d7Multi_c = .data:0x8051002C; // type:object size:0x1C
+__vt__Q23d2d8Layout_c = .data:0x80510048; // type:object size:0x40
 lbl_80510088 = .data:0x80510088; // type:object size:0x18
 lbl_805100A0 = .data:0x805100A0; // type:object size:0xC
 lbl_805100AC = .data:0x805100AC; // type:object size:0x1C
@@ -30987,7 +30987,7 @@ lbl_80510780 = .data:0x80510780; // type:object size:0xC
 lbl_8051078C = .data:0x8051078C; // type:object size:0xC
 lbl_80510798 = .data:0x80510798; // type:object size:0x88
 lbl_80510820 = .data:0x80510820; // type:object size:0x90
-lbl_805108B0 = .data:0x805108B0; // type:object size:0x18
+__vt__20dLytFontRefAndAccess = .data:0x805108B0; // type:object size:0x18
 lbl_805108C8 = .data:0x805108C8; // type:object size:0x10
 lbl_805108D8 = .data:0x805108D8; // type:object size:0x10
 lbl_805108E8 = .data:0x805108E8; // type:object size:0x10
@@ -33495,14 +33495,14 @@ lbl_80528BF4 = .data:0x80528BF4; // type:object size:0xC
 lbl_80528C00 = .data:0x80528C00; // type:object size:0x10
 lbl_80528C10 = .data:0x80528C10; // type:object size:0x30
 lbl_80528C40 = .data:0x80528C40; // type:object size:0x88
-lbl_80528CC8 = .data:0x80528CC8; // type:object size:0x18 data:string
-lbl_80528CE0 = .data:0x80528CE0; // type:object size:0xC
-lbl_80528CEC = .data:0x80528CEC; // type:object size:0x18
-lbl_80528D04 = .data:0x80528D04; // type:object size:0x14
-lbl_80528D18 = .data:0x80528D18; // type:object size:0xC
-lbl_80528D24 = .data:0x80528D24; // type:object size:0xC
-lbl_80528D30 = .data:0x80528D30; // type:object size:0x10
-lbl_80528D40 = .data:0x80528D40; // type:object size:0x28
+lbl_80528CC8 = .data:0x80528CC8; // type:object size:0x18 scope:local data:string
+lbl_80528CE0 = .data:0x80528CE0; // type:object size:0xA scope:local data:string
+lbl_80528CEC = .data:0x80528CEC; // type:object size:0x17 scope:local data:string
+lbl_80528D04 = .data:0x80528D04; // type:object size:0x12 scope:local data:string
+lbl_80528D18 = .data:0x80528D18; // type:object size:0x9 scope:local data:string
+lbl_80528D24 = .data:0x80528D24; // type:object size:0x9 scope:local data:string
+lbl_80528D30 = .data:0x80528D30; // type:object size:0xE scope:local data:string
+__vt__11dLytFader_c = .data:0x80528D40; // type:object size:0x24
 lbl_80528D68 = .data:0x80528D68; // type:object size:0x28
 lbl_80528D90 = .data:0x80528D90; // type:object size:0x10
 lbl_80528DA0 = .data:0x80528DA0; // type:object size:0x168
@@ -38195,7 +38195,7 @@ lbl_80572A90 = .sdata:0x80572A90; // type:object size:0x8 data:string
 lbl_80572A98 = .sdata:0x80572A98; // type:object size:0x8 data:string
 lbl_80572AA0 = .sdata:0x80572AA0; // type:object size:0x4
 lbl_80572AA4 = .sdata:0x80572AA4; // type:object size:0x4
-lbl_80572AA8 = .sdata:0x80572AA8; // type:object size:0x8
+lbl_80572AA8 = .sdata:0x80572AA8; // type:object size:0x1 scope:local
 lbl_80572AB0 = .sdata:0x80572AB0; // type:object size:0x8
 lbl_80572AB8 = .sdata:0x80572AB8; // type:object size:0x8
 lbl_80572AC0 = .sdata:0x80572AC0; // type:object size:0x8

diff --git a/configure.py b/configure.py
@@ -342,6 +342,9 @@ def nw4rLib(lib_name, objects, extra_cflags=[]):
             Object(Matching, "toBeSorted/counters/slingshot_seed_counter.cpp"),
             Object(Matching, "toBeSorted/counters/key_piece_counter.cpp"),
             Object(Matching, "toBeSorted/counters/extra_wallet_counter.cpp"),
+            Object(NonMatching, "toBeSorted/lyt/d2d.cpp"),
+            Object(Matching, "toBeSorted/lyt/d_lyt_fader.cpp"),
+            Object(NonMatching, "toBeSorted/lyt/pause_disp_00.cpp"),
             Object(NonMatching, "toBeSorted/file_manager.cpp"),
             Object(NonMatching, "toBeSorted/save_manager.cpp"),
             Object(NonMatching, "f/f_base.cpp"),

diff --git a/include/MSL_C/MSL_Common/Src/ansi_files.h b/include/MSL_C/MSL_Common/Src/ansi_files.h
@@ -7,9 +7,11 @@
 extern "C" {
 #endif
 
+#if 0
 #define SEEK_SET 0
 #define SEEK_CUR 1
 #define SEEK_END 2
+#endif
 
 typedef unsigned long __file_handle;
 typedef unsigned long fpos_t;

diff --git a/include/egg/prim/eggAssert.h b/include/egg/prim/eggAssert.h
@@ -2,6 +2,7 @@
 #define EGG_ASSERT_H
 
 #include <common.h>
+#include <Runtime.PPCEABI.H/__va_arg.h>
 
 namespace EGG {
 // All this is guess

diff --git a/include/m/m2d.h b/include/m/m2d.h
@@ -62,6 +62,19 @@ class FrameCtrl_c {
         return mCurrFrame;
     }
 
+    inline void setToStart() {
+        setFrame(0.0f);
+    }
+
+    inline bool isEndReached() {
+        f32 actualEnd = mEndFrame - 1.0f;
+        return mCurrFrame >= actualEnd;
+    }
+
+    inline void setToEnd() {
+        setFrame(mEndFrame - 1.0f);
+    }
+
 private:
     inline bool notLooping() const {
         return (mFlags & FLAG_NO_LOOP) != 0;
@@ -114,9 +127,11 @@ class Base_c {
 public:
     Base_c(u8 priority) : mPriority(priority) {}
     /* 0x00 */ nw4r::ut::Node mLink;
-    /* vt 0x04 */
-    virtual ~Base_c();
-    virtual void draw();
+
+    /* vt offset 0x04 */
+    /* vt 0x08 */ virtual ~Base_c();
+    /* vt 0x0C */ virtual void draw();
+
     /* 0x0C */ u8 mPriority;
 
     void addToDrawList();
@@ -125,10 +140,10 @@ class Base_c {
 class Simple_c : public Base_c {
 public:
     Simple_c();
-    virtual ~Simple_c();
-    virtual void draw() override;
-    virtual void calc();
-    virtual bool build(const char *name, ResAccIf_c *acc);
+    /* vt 0x08 */ virtual ~Simple_c();
+    /* vt 0x0C */ virtual void draw() override;
+    /* vt 0x10 */ virtual void calc();
+    /* vt 0x14 */ virtual bool build(const char *name, ResAccIf_c *acc);
 
     void calcBefore();
     void calcAfter();
@@ -148,6 +163,6 @@ class Simple_c : public Base_c {
     u32 field_0x94;
 };
 
-} // namespace m2d
+}
 
 #endif
diff --git a/include/m/m_color_fader.h b/include/m/m_color_fader.h
@@ -12,7 +12,7 @@ class mColorFader_c : public mFaderBase_c {
     virtual ~mColorFader_c();
 
     virtual void setStatus(EStatus status) override;
-    virtual u8 calc() override;
+    virtual bool calc() override;
     virtual void draw() override;
 
     u8 mAspectRatio;

diff --git a/include/m/m_fader_base.h b/include/m/m_fader_base.h
@@ -26,7 +26,7 @@ class mFaderBase_c {
     virtual EStatus getStatus() const;
     virtual bool fadeIn();
     virtual bool fadeOut();
-    virtual u8 calc();
+    virtual bool calc();
     virtual void draw() = 0;
 
     void setFrame(u16 frame);

diff --git a/include/nw4r/lyt/lyt_layout.h b/include/nw4r/lyt/lyt_layout.h
@@ -51,6 +51,10 @@ class Layout {
         return mpRootPane;
     }
 
+    GroupContainer *GetGroupContainer() const {
+        return mpGroupContainer;
+    }
+
 private:
     ut::LinkList<AnimTransform, 4> mAnimTransList; // at 0x04
     Pane *mpRootPane;                              // at 0x10

diff --git a/include/toBeSorted/arc_managers/layout_arc_manager.h b/include/toBeSorted/arc_managers/layout_arc_manager.h
@@ -6,6 +6,7 @@
 #include <sized_string.h>
 
 class LayoutArcManager {
+public:
     LayoutArcManager();
     virtual ~LayoutArcManager();