diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index acdcc786..d11ec110 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -424,7 +424,7 @@ d/lyt/d_lyt_map.cpp: .text start:0x8012DC30 end:0x80148DE8 .ctors start:0x804DB76C end:0x804DB770 .data start:0x8051EAE0 end:0x805225E8 - .bss start:0x805AF480 end:0x805B0830 + .bss start:0x805AF470 end:0x805B0830 d/lyt/d_lyt_note.cpp: .text start:0x80148DF0 end:0x80149C28 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index e23eaa7b..c80be21a 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -7482,7 +7482,7 @@ fn_8012D370 = .text:0x8012D370; // type:function size:0x1C fn_8012D390 = .text:0x8012D390; // type:function size:0x118 LytMapCapture__stateRenderingWaitEnter = .text:0x8012D4B0; // type:function size:0x4 LytMapCapture__stateRenderingWaitUpdate = .text:0x8012D4C0; // type:function size:0x70 -fn_8012D530 = .text:0x8012D530; // type:function size:0x10 +changeState__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x8012D530; // type:function size:0x10 LytMapCapture__stateRenderingWaitLeave = .text:0x8012D540; // type:function size:0x4 LytMapCapture__stateRenderingWaitStep2Enter = .text:0x8012D550; // type:function size:0x4 LytMapCapture__stateRenderingWaitStep2Update = .text:0x8012D560; // type:function size:0x94 @@ -7500,8 +7500,8 @@ fn_8012D950 = .text:0x8012D950; // type:function size:0x30 LytMapCapture__initStates = .text:0x8012D980; // type:function size:0x1C0 LytMapCapture__dtor = .text:0x8012DB40; // type:function size:0x58 fn_8012DBA0 = .text:0x8012DBA0; // type:function size:0x88 -fn_8012DC30 = .text:0x8012DC30; // type:function size:0xEC -fn_8012DD20 = .text:0x8012DD20; // type:function size:0x40 +__ct__17LytMapConfigMaybeFv = .text:0x8012DC30; // type:function size:0xEC +__dt__17LytMapConfigMaybeFv = .text:0x8012DD20; // type:function size:0x40 fn_8012DD60 = .text:0x8012DD60; // type:function size:0x17C fn_8012DEE0 = .text:0x8012DEE0; // type:function size:0x70 fn_8012DF50 = .text:0x8012DF50; // type:function size:0x20 @@ -7523,7 +7523,7 @@ fn_8012E7D0 = .text:0x8012E7D0; // type:function size:0x3C fn_8012E810 = .text:0x8012E810; // type:function size:0x24 fn_8012E840 = .text:0x8012E840; // type:function size:0x14 fn_8012E860 = .text:0x8012E860; // type:function size:0x58 -fn_8012E8C0 = .text:0x8012E8C0; // type:function size:0x10 +changeState__85sStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x8012E8C0; // type:function size:0x10 fn_8012E8D0 = .text:0x8012E8D0; // type:function size:0x4 fn_8012E8E0 = .text:0x8012E8E0; // type:function size:0x48 fn_8012E930 = .text:0x8012E930; // type:function size:0x18 @@ -7542,21 +7542,21 @@ fn_8012EC30 = .text:0x8012EC30; // type:function size:0x80 fn_8012ECB0 = .text:0x8012ECB0; // type:function size:0x10C fn_8012EDC0 = .text:0x8012EDC0; // type:function size:0x2C __dt__16dLytMapPinIcon_cFv = .text:0x8012EDF0; // type:function size:0x110 -fn_8012EF00 = .text:0x8012EF00; // type:function size:0xA4 -fn_8012EFB0 = .text:0x8012EFB0; // type:function size:0xA0 -fn_8012F050 = .text:0x8012F050; // type:function size:0x6C -fn_8012F0C0 = .text:0x8012F0C0; // type:function size:0x58 +__dt__55sFStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c>Fv = .text:0x8012EF00; // type:function size:0xA4 +__dt__85sStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x8012EFB0; // type:function size:0xA0 +__dt__32sFStateFct_c<16dLytMapPinIcon_c>Fv = .text:0x8012F050; // type:function size:0x6C +__dt__29sFState_c<16dLytMapPinIcon_c>Fv = .text:0x8012F0C0; // type:function size:0x58 fn_8012F120 = .text:0x8012F120; // type:function size:0x8 fn_8012F130 = .text:0x8012F130; // type:function size:0x17C fn_8012F2B0 = .text:0x8012F2B0; // type:function size:0x6C fn_8012F320 = .text:0x8012F320; // type:function size:0x60 fn_8012F380 = .text:0x8012F380; // type:function size:0xE4 -fn_8012F470 = .text:0x8012F470; // type:function size:0x10 +executeState__85sStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x8012F470; // type:function size:0x10 fn_8012F480 = .text:0x8012F480; // type:function size:0x34 fn_8012F4C0 = .text:0x8012F4C0; // type:function size:0x4 fn_8012F4D0 = .text:0x8012F4D0; // type:function size:0xD8 -fn_8012F5B0 = .text:0x8012F5B0; // type:function size:0x10 -fn_8012F5C0 = .text:0x8012F5C0; // type:function size:0x10 +getStateID__85sStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x8012F5B0; // type:function size:0x10 +changeState__94sStateMgr_c<25dLytMapPinIconAggregate_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x8012F5C0; // type:function size:0x10 fn_8012F5D0 = .text:0x8012F5D0; // type:function size:0x4 fn_8012F5E0 = .text:0x8012F5E0; // type:function size:0x4 fn_8012F5F0 = .text:0x8012F5F0; // type:function size:0x168 @@ -7574,12 +7574,12 @@ fn_8012F9C0 = .text:0x8012F9C0; // type:function size:0x5C fn_8012FA20 = .text:0x8012FA20; // type:function size:0xA8 fn_8012FAD0 = .text:0x8012FAD0; // type:function size:0x50 fn_8012FB20 = .text:0x8012FB20; // type:function size:0xA8 -fn_8012FBD0 = .text:0x8012FBD0; // type:function size:0x10 +executeState__94sStateMgr_c<25dLytMapPinIconAggregate_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x8012FBD0; // type:function size:0x10 fn_8012FBE0 = .text:0x8012FBE0; // type:function size:0x50 fn_8012FC30 = .text:0x8012FC30; // type:function size:0x18 -fn_8012FC50 = .text:0x8012FC50; // type:function size:0x10 +changeState__86sStateMgr_c<17dLytMapFloorBtn_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x8012FC50; // type:function size:0x10 fn_8012FC60 = .text:0x8012FC60; // type:function size:0x10 -fn_8012FC70 = .text:0x8012FC70; // type:function size:0x10 +executeState__86sStateMgr_c<17dLytMapFloorBtn_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x8012FC70; // type:function size:0x10 fn_8012FC80 = .text:0x8012FC80; // type:function size:0xB4 fn_8012FD40 = .text:0x8012FD40; // type:function size:0xAC fn_8012FDF0 = .text:0x8012FDF0; // type:function size:0x4 @@ -7611,28 +7611,28 @@ fn_80130490 = .text:0x80130490; // type:function size:0x78 fn_80130510 = .text:0x80130510; // type:function size:0x4 __dt__20dLytMapFloorBtnMgr_cFv = .text:0x80130520; // type:function size:0x17C __dt__17dLytMapFloorBtn_cFv = .text:0x801306A0; // type:function size:0xA8 -fn_80130750 = .text:0x80130750; // type:function size:0xA4 -fn_80130800 = .text:0x80130800; // type:function size:0xA0 -fn_801308A0 = .text:0x801308A0; // type:function size:0x6C -fn_80130910 = .text:0x80130910; // type:function size:0x58 +__dt__56sFStateMgr_c<17dLytMapFloorBtn_c,20sStateMethodUsr_FI_c>Fv = .text:0x80130750; // type:function size:0xA4 +__dt__86sStateMgr_c<17dLytMapFloorBtn_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80130800; // type:function size:0xA0 +__dt__33sFStateFct_c<17dLytMapFloorBtn_c>Fv = .text:0x801308A0; // type:function size:0x6C +__dt__30sFState_c<17dLytMapFloorBtn_c>Fv = .text:0x80130910; // type:function size:0x58 fn_80130970 = .text:0x80130970; // type:function size:0xA0 -fn_80130A10 = .text:0x80130A10; // type:function size:0xA4 -fn_80130AC0 = .text:0x80130AC0; // type:function size:0xA0 -fn_80130B60 = .text:0x80130B60; // type:function size:0x6C -fn_80130BD0 = .text:0x80130BD0; // type:function size:0x58 +__dt__59sFStateMgr_c<20dLytMapFloorBtnMgr_c,20sStateMethodUsr_FI_c>Fv = .text:0x80130A10; // type:function size:0xA4 +__dt__89sStateMgr_c<20dLytMapFloorBtnMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80130AC0; // type:function size:0xA0 +__dt__36sFStateFct_c<20dLytMapFloorBtnMgr_c>Fv = .text:0x80130B60; // type:function size:0x6C +__dt__33sFState_c<20dLytMapFloorBtnMgr_c>Fv = .text:0x80130BD0; // type:function size:0x58 fn_80130C30 = .text:0x80130C30; // type:function size:0x300 -fn_80130F30 = .text:0x80130F30; // type:function size:0x10 +changeState__89sStateMgr_c<20dLytMapFloorBtnMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x80130F30; // type:function size:0x10 fn_80130F40 = .text:0x80130F40; // type:function size:0xB4 fn_80131000 = .text:0x80131000; // type:function size:0x2D4 -fn_801312E0 = .text:0x801312E0; // type:function size:0x10 -fn_801312F0 = .text:0x801312F0; // type:function size:0x10 +getStateID__89sStateMgr_c<20dLytMapFloorBtnMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801312E0; // type:function size:0x10 +executeState__89sStateMgr_c<20dLytMapFloorBtnMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801312F0; // type:function size:0x10 fn_80131300 = .text:0x80131300; // type:function size:0xF0 fn_801313F0 = .text:0x801313F0; // type:function size:0x58 fn_80131450 = .text:0x80131450; // type:function size:0x8 fn_80131460 = .text:0x80131460; // type:function size:0xC4 fn_80131530 = .text:0x80131530; // type:function size:0x5C fn_80131590 = .text:0x80131590; // type:function size:0x1D8 -fn_80131770 = .text:0x80131770; // type:function size:0x10 +getStateID__86sStateMgr_c<17dLytMapFloorBtn_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80131770; // type:function size:0x10 fn_80131780 = .text:0x80131780; // type:function size:0x50 fn_801317D0 = .text:0x801317D0; // type:function size:0x27C fn_80131A50 = .text:0x80131A50; // type:function size:0x4 @@ -7641,18 +7641,18 @@ fn_80131A70 = .text:0x80131A70; // type:function size:0x4 fn_80131A80 = .text:0x80131A80; // type:function size:0x4 fn_80131A90 = .text:0x80131A90; // type:function size:0x4 fn_80131AA0 = .text:0x80131AA0; // type:function size:0x4 -fn_80131AB0 = .text:0x80131AB0; // type:function size:0x98 +__ct__14dLytMapFader_cFv = .text:0x80131AB0; // type:function size:0x98 __ct__Q23m2d6Base_cFv = .text:0x80131B50; // type:function size:0x18 __dt__Q23EGG10ColorFaderFv = .text:0x80131B70; // type:function size:0x40 -fn_80131BB0 = .text:0x80131BB0; // type:function size:0x58 -fn_80131C10 = .text:0x80131C10; // type:function size:0x10 -fn_80131C20 = .text:0x80131C20; // type:function size:0x10 +__dt__14dLytMapFader_cFv = .text:0x80131BB0; // type:function size:0x58 +calc__14dLytMapFader_cFv = .text:0x80131C10; // type:function size:0x10 +draw__14dLytMapFader_cFv = .text:0x80131C20; // type:function size:0x10 fn_80131C30 = .text:0x80131C30; // type:function size:0x4 fn_80131C40 = .text:0x80131C40; // type:function size:0x4 fn_80131C50 = .text:0x80131C50; // type:function size:0x4 fn_80131C60 = .text:0x80131C60; // type:function size:0xC fn_80131C70 = .text:0x80131C70; // type:function size:0x88 -fn_80131D00 = .text:0x80131D00; // type:function size:0x10 +changeState__87sStateMgr_c<18dLytMapPopupInfo_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x80131D00; // type:function size:0x10 fn_80131D10 = .text:0x80131D10; // type:function size:0x4 fn_80131D20 = .text:0x80131D20; // type:function size:0x4 fn_80131D30 = .text:0x80131D30; // type:function size:0xB8 @@ -7666,11 +7666,11 @@ fn_80131F60 = .text:0x80131F60; // type:function size:0x4 fn_80131F70 = .text:0x80131F70; // type:function size:0xB0 fn_80132020 = .text:0x80132020; // type:function size:0x4C fn_80132070 = .text:0x80132070; // type:function size:0x94 -fn_80132110 = .text:0x80132110; // type:function size:0x10 +executeState__87sStateMgr_c<18dLytMapPopupInfo_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80132110; // type:function size:0x10 fn_80132120 = .text:0x80132120; // type:function size:0x14 fn_80132140 = .text:0x80132140; // type:function size:0x4 fn_80132150 = .text:0x80132150; // type:function size:0x28 -fn_80132180 = .text:0x80132180; // type:function size:0x10 +changeState__93sStateMgr_c<24dLytMapSavePopupAction_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x80132180; // type:function size:0x10 fn_80132190 = .text:0x80132190; // type:function size:0x4 fn_801321A0 = .text:0x801321A0; // type:function size:0x7C fn_80132220 = .text:0x80132220; // type:function size:0xC4 @@ -7682,14 +7682,14 @@ fn_80132350 = .text:0x80132350; // type:function size:0x7C fn_801323D0 = .text:0x801323D0; // type:function size:0xB4 fn_80132490 = .text:0x80132490; // type:function size:0x4 fn_801324A0 = .text:0x801324A0; // type:function size:0x10 -fn_801324B0 = .text:0x801324B0; // type:function size:0x10 +executeState__93sStateMgr_c<24dLytMapSavePopupAction_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801324B0; // type:function size:0x10 fn_801324C0 = .text:0x801324C0; // type:function size:0x10 fn_801324D0 = .text:0x801324D0; // type:function size:0x78 fn_80132550 = .text:0x80132550; // type:function size:0xD0 fn_80132620 = .text:0x80132620; // type:function size:0x4C fn_80132670 = .text:0x80132670; // type:function size:0x94 fn_80132710 = .text:0x80132710; // type:function size:0x318 -fn_80132A30 = .text:0x80132A30; // type:function size:0x10 +getStateID__93sStateMgr_c<24dLytMapSavePopupAction_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80132A30; // type:function size:0x10 fn_80132A40 = .text:0x80132A40; // type:function size:0xC fn_80132A50 = .text:0x80132A50; // type:function size:0xA4 fn_80132B00 = .text:0x80132B00; // type:function size:0x10 @@ -7698,7 +7698,7 @@ fn_80132B20 = .text:0x80132B20; // type:function size:0x4 fn_80132B30 = .text:0x80132B30; // type:function size:0x4 fn_80132B40 = .text:0x80132B40; // type:function size:0x9C fn_80132BE0 = .text:0x80132BE0; // type:function size:0x94 -fn_80132C80 = .text:0x80132C80; // type:function size:0x10 +changeState__89sStateMgr_c<20dLytMapSaveCaption_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x80132C80; // type:function size:0x10 fn_80132C90 = .text:0x80132C90; // type:function size:0x4 fn_80132CA0 = .text:0x80132CA0; // type:function size:0x4 fn_80132CB0 = .text:0x80132CB0; // type:function size:0x4 @@ -7709,14 +7709,14 @@ fn_80132DB0 = .text:0x80132DB0; // type:function size:0x4 fn_80132DC0 = .text:0x80132DC0; // type:function size:0xB0 fn_80132E70 = .text:0x80132E70; // type:function size:0x4C fn_80132EC0 = .text:0x80132EC0; // type:function size:0xA0 -fn_80132F60 = .text:0x80132F60; // type:function size:0x10 +executeState__89sStateMgr_c<20dLytMapSaveCaption_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80132F60; // type:function size:0x10 fn_80132F70 = .text:0x80132F70; // type:function size:0x6C -fn_80132FE0 = .text:0x80132FE0; // type:function size:0x10 +getStateID__89sStateMgr_c<20dLytMapSaveCaption_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80132FE0; // type:function size:0x10 fn_80132FF0 = .text:0x80132FF0; // type:function size:0xA0 fn_80133090 = .text:0x80133090; // type:function size:0x19C fn_80133230 = .text:0x80133230; // type:function size:0x4 fn_80133240 = .text:0x80133240; // type:function size:0x78 -fn_801332C0 = .text:0x801332C0; // type:function size:0x10 +changeState__85sStateMgr_c<16dLytMapSaveObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x801332C0; // type:function size:0x10 fn_801332D0 = .text:0x801332D0; // type:function size:0x4 fn_801332E0 = .text:0x801332E0; // type:function size:0x4 fn_801332F0 = .text:0x801332F0; // type:function size:0xC0 @@ -7736,28 +7736,28 @@ fn_80133660 = .text:0x80133660; // type:function size:0xB0 fn_80133710 = .text:0x80133710; // type:function size:0xF8 fn_80133810 = .text:0x80133810; // type:function size:0x4C fn_80133860 = .text:0x80133860; // type:function size:0x54 -fn_801338C0 = .text:0x801338C0; // type:function size:0x10 +executeState__85sStateMgr_c<16dLytMapSaveObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801338C0; // type:function size:0x10 fn_801338D0 = .text:0x801338D0; // type:function size:0x60 __ct__13dLytMapMain_cFv = .text:0x80133930; // type:function size:0x358 fn_80133C90 = .text:0x80133C90; // type:function size:0x1C fn_80133CB0 = .text:0x80133CB0; // type:function size:0x40 __ct__16dLytMapCapture_cFv = .text:0x80133CF0; // type:function size:0xE0 -fn_80133DD0 = .text:0x80133DD0; // type:function size:0x58 -fn_80133E30 = .text:0x80133E30; // type:function size:0x6C -fn_80133EA0 = .text:0x80133EA0; // type:function size:0xA0 -fn_80133F40 = .text:0x80133F40; // type:function size:0xA4 -fn_80133FF0 = .text:0x80133FF0; // type:function size:0xB4 +__dt__29sFState_c<16dLytMapCapture_c>Fv = .text:0x80133DD0; // type:function size:0x58 +__dt__32sFStateFct_c<16dLytMapCapture_c>Fv = .text:0x80133E30; // type:function size:0x6C +__dt__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80133EA0; // type:function size:0xA0 +__dt__55sFStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c>Fv = .text:0x80133F40; // type:function size:0xA4 +__dt__16dLytMapCapture_cFv = .text:0x80133FF0; // type:function size:0xB4 __ct__20dLytMapFloorBtnMgr_cFPv = .text:0x801340B0; // type:function size:0x178 fn_80134230 = .text:0x80134230; // type:function size:0x140 __ct__Q23d2d11dLytStructDFv = .text:0x80134370; // type:function size:0x48 __ct__17dLytMapFloorBtn_cFv = .text:0x801343C0; // type:function size:0xAC __ct__25dLytMapPinIconAggregate_cFv = .text:0x80134470; // type:function size:0xF0 -fn_80134560 = .text:0x80134560; // type:function size:0x58 -fn_801345C0 = .text:0x801345C0; // type:function size:0x6C -fn_80134630 = .text:0x80134630; // type:function size:0xA0 -fn_801346D0 = .text:0x801346D0; // type:function size:0xA4 +__dt__38sFState_c<25dLytMapPinIconAggregate_c>Fv = .text:0x80134560; // type:function size:0x58 +__dt__41sFStateFct_c<25dLytMapPinIconAggregate_c>Fv = .text:0x801345C0; // type:function size:0x6C +__dt__94sStateMgr_c<25dLytMapPinIconAggregate_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80134630; // type:function size:0xA0 +__dt__64sFStateMgr_c<25dLytMapPinIconAggregate_c,20sStateMethodUsr_FI_c>Fv = .text:0x801346D0; // type:function size:0xA4 __ct__16dLytMapPinIcon_cFv = .text:0x80134780; // type:function size:0x134 -fn_801348C0 = .text:0x801348C0; // type:function size:0xCC +__dt__25dLytMapPinIconAggregate_cFv = .text:0x801348C0; // type:function size:0xCC fn_80134990 = .text:0x80134990; // type:function size:0x464 fn_80134E00 = .text:0x80134E00; // type:function size:0x74 fn_80134E80 = .text:0x80134E80; // type:function size:0x10 @@ -7776,45 +7776,45 @@ fn_80135450 = .text:0x80135450; // type:function size:0x78 fn_801354D0 = .text:0x801354D0; // type:function size:0x54 fn_80135530 = .text:0x80135530; // type:function size:0x5C __ct__16dLytMapSaveObj_cFv = .text:0x80135590; // type:function size:0xC8 -fn_80135660 = .text:0x80135660; // type:function size:0x58 -fn_801356C0 = .text:0x801356C0; // type:function size:0x6C -fn_80135730 = .text:0x80135730; // type:function size:0xA0 -fn_801357D0 = .text:0x801357D0; // type:function size:0xA4 +__dt__29sFState_c<16dLytMapSaveObj_c>Fv = .text:0x80135660; // type:function size:0x58 +__dt__32sFStateFct_c<16dLytMapSaveObj_c>Fv = .text:0x801356C0; // type:function size:0x6C +__dt__85sStateMgr_c<16dLytMapSaveObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80135730; // type:function size:0xA0 +__dt__55sFStateMgr_c<16dLytMapSaveObj_c,20sStateMethodUsr_FI_c>Fv = .text:0x801357D0; // type:function size:0xA4 __dt__16dLytMapSaveObj_cFv = .text:0x80135880; // type:function size:0xD0 __ct__20dLytMapSaveCaption_cFv = .text:0x80135950; // type:function size:0xB4 -fn_80135A10 = .text:0x80135A10; // type:function size:0x58 -fn_80135A70 = .text:0x80135A70; // type:function size:0x6C -fn_80135AE0 = .text:0x80135AE0; // type:function size:0xA0 -fn_80135B80 = .text:0x80135B80; // type:function size:0xA4 +__dt__33sFState_c<20dLytMapSaveCaption_c>Fv = .text:0x80135A10; // type:function size:0x58 +__dt__36sFStateFct_c<20dLytMapSaveCaption_c>Fv = .text:0x80135A70; // type:function size:0x6C +__dt__89sStateMgr_c<20dLytMapSaveCaption_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80135AE0; // type:function size:0xA0 +__dt__59sFStateMgr_c<20dLytMapSaveCaption_c,20sStateMethodUsr_FI_c>Fv = .text:0x80135B80; // type:function size:0xA4 __ct__18dLytMapSavePopup_cFv = .text:0x80135C30; // type:function size:0x84 __ct__24dLytMapSavePopupAction_cFv = .text:0x80135CC0; // type:function size:0xA0 -fn_80135D60 = .text:0x80135D60; // type:function size:0x58 -fn_80135DC0 = .text:0x80135DC0; // type:function size:0x6C -fn_80135E30 = .text:0x80135E30; // type:function size:0xA0 -fn_80135ED0 = .text:0x80135ED0; // type:function size:0xA4 +__dt__37sFState_c<24dLytMapSavePopupAction_c>Fv = .text:0x80135D60; // type:function size:0x58 +__dt__40sFStateFct_c<24dLytMapSavePopupAction_c>Fv = .text:0x80135DC0; // type:function size:0x6C +__dt__93sStateMgr_c<24dLytMapSavePopupAction_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80135E30; // type:function size:0xA0 +__dt__63sFStateMgr_c<24dLytMapSavePopupAction_c,20sStateMethodUsr_FI_c>Fv = .text:0x80135ED0; // type:function size:0xA4 __dt__24dLytMapSavePopupAction_cFv = .text:0x80135F80; // type:function size:0xA8 -__ct__16dLytMapPopupInfoFv = .text:0x80136030; // type:function size:0xB4 -fn_801360F0 = .text:0x801360F0; // type:function size:0x58 -fn_80136150 = .text:0x80136150; // type:function size:0x6C -fn_801361C0 = .text:0x801361C0; // type:function size:0xA0 -fn_80136260 = .text:0x80136260; // type:function size:0xA4 +__ct__18dLytMapPopupInfo_cFv = .text:0x80136030; // type:function size:0xB4 +__dt__31sFState_c<18dLytMapPopupInfo_c>Fv = .text:0x801360F0; // type:function size:0x58 +__dt__34sFStateFct_c<18dLytMapPopupInfo_c>Fv = .text:0x80136150; // type:function size:0x6C +__dt__87sStateMgr_c<18dLytMapPopupInfo_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801361C0; // type:function size:0xA0 +__dt__57sFStateMgr_c<18dLytMapPopupInfo_c,20sStateMethodUsr_FI_c>Fv = .text:0x80136260; // type:function size:0xA4 __ct__52sFStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c>FR13dLytMapMain_c = .text:0x80136310; // type:function size:0x90 -fn_801363A0 = .text:0x801363A0; // type:function size:0x58 -fn_80136400 = .text:0x80136400; // type:function size:0x6C -fn_80136470 = .text:0x80136470; // type:function size:0xA0 -fn_80136510 = .text:0x80136510; // type:function size:0xA4 +__dt__26sFState_c<13dLytMapMain_c>Fv = .text:0x801363A0; // type:function size:0x58 +__dt__29sFStateFct_c<13dLytMapMain_c>Fv = .text:0x80136400; // type:function size:0x6C +__dt__82sStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80136470; // type:function size:0xA0 +__dt__52sFStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c>Fv = .text:0x80136510; // type:function size:0xA4 fn_801365C0 = .text:0x801365C0; // type:function size:0x4 fn_801365D0 = .text:0x801365D0; // type:function size:0x40 __dt__13dLytMapMain_cFv = .text:0x80136610; // type:function size:0x608 fn_80136C20 = .text:0x80136C20; // type:function size:0xC fn_80136C30 = .text:0x80136C30; // type:function size:0xC8 fn_80136D00 = .text:0x80136D00; // type:function size:0x6CC -fn_801373D0 = .text:0x801373D0; // type:function size:0x10 +changeState__82sStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x801373D0; // type:function size:0x10 fn_801373E0 = .text:0x801373E0; // type:function size:0xAC fn_80137490 = .text:0x80137490; // type:function size:0x2E8 fn_80137780 = .text:0x80137780; // type:function size:0x15C fn_801378E0 = .text:0x801378E0; // type:function size:0x838 -fn_80138120 = .text:0x80138120; // type:function size:0x10 +getStateID__94sStateMgr_c<25dLytMapPinIconAggregate_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80138120; // type:function size:0x10 draw__13dLytMapMain_cFv = .text:0x80138130; // type:function size:0x238 fn_80138370 = .text:0x80138370; // type:function size:0x138 fn_801384B0 = .text:0x801384B0; // type:function size:0x5C @@ -7983,7 +7983,7 @@ fn_80141FD0 = .text:0x80141FD0; // type:function size:0x4 whatBirdStatuesToShow = .text:0x80141FE0; // type:function size:0x1D4 fn_801421C0 = .text:0x801421C0; // type:function size:0x4 fn_801421D0 = .text:0x801421D0; // type:function size:0x278 -fn_80142450 = .text:0x80142450; // type:function size:0x10 +getStateID__85sStateMgr_c<16dLytMapSaveObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80142450; // type:function size:0x10 fn_80142460 = .text:0x80142460; // type:function size:0x4 getStatueSelectDestinationStruct = .text:0x80142470; // type:function size:0xEC fn_80142560 = .text:0x80142560; // type:function size:0x18 @@ -8014,167 +8014,167 @@ fn_80143A30 = .text:0x80143A30; // type:function size:0x70 getName__20dLytMapFloorBtnMgr_cCFv = .text:0x80143AA0; // type:function size:0x8 getLyt__20dLytMapFloorBtnMgr_cFv = .text:0x80143AB0; // type:function size:0x8 getPane__20dLytMapFloorBtnMgr_cFv = .text:0x80143AC0; // type:function size:0x8 -fn_80143AD0 = .text:0x80143AD0; // type:function size:0x60 -fn_80143B30 = .text:0x80143B30; // type:function size:0xC -fn_80143B40 = .text:0x80143B40; // type:function size:0x60 -fn_80143BA0 = .text:0x80143BA0; // type:function size:0xC -fn_80143BB0 = .text:0x80143BB0; // type:function size:0x60 -fn_80143C10 = .text:0x80143C10; // type:function size:0xC -fn_80143C20 = .text:0x80143C20; // type:function size:0x60 -fn_80143C80 = .text:0x80143C80; // type:function size:0xC -fn_80143C90 = .text:0x80143C90; // type:function size:0x60 -fn_80143CF0 = .text:0x80143CF0; // type:function size:0xC -fn_80143D00 = .text:0x80143D00; // type:function size:0x60 -fn_80143D60 = .text:0x80143D60; // type:function size:0xC -fn_80143D70 = .text:0x80143D70; // type:function size:0x60 -fn_80143DD0 = .text:0x80143DD0; // type:function size:0xC -fn_80143DE0 = .text:0x80143DE0; // type:function size:0x60 -fn_80143E40 = .text:0x80143E40; // type:function size:0xC -fn_80143E50 = .text:0x80143E50; // type:function size:0x60 -fn_80143EB0 = .text:0x80143EB0; // type:function size:0xC -fn_80143EC0 = .text:0x80143EC0; // type:function size:0x60 -fn_80143F20 = .text:0x80143F20; // type:function size:0xC -fn_80143F30 = .text:0x80143F30; // type:function size:0x1C -fn_80143F50 = .text:0x80143F50; // type:function size:0x1C -fn_80143F70 = .text:0x80143F70; // type:function size:0x1C -fn_80143F90 = .text:0x80143F90; // type:function size:0x1C -fn_80143FB0 = .text:0x80143FB0; // type:function size:0x1C -fn_80143FD0 = .text:0x80143FD0; // type:function size:0x1C -fn_80143FF0 = .text:0x80143FF0; // type:function size:0x1C -fn_80144010 = .text:0x80144010; // type:function size:0x1C -fn_80144030 = .text:0x80144030; // type:function size:0x1C -fn_80144050 = .text:0x80144050; // type:function size:0x1C -fn_80144070 = .text:0x80144070; // type:function size:0x1C -fn_80144090 = .text:0x80144090; // type:function size:0x1C -fn_801440B0 = .text:0x801440B0; // type:function size:0x1C -fn_801440D0 = .text:0x801440D0; // type:function size:0x1C -fn_801440F0 = .text:0x801440F0; // type:function size:0x1C -fn_80144110 = .text:0x80144110; // type:function size:0x1C -fn_80144130 = .text:0x80144130; // type:function size:0x1C -fn_80144150 = .text:0x80144150; // type:function size:0x1C -fn_80144170 = .text:0x80144170; // type:function size:0x1C -fn_80144190 = .text:0x80144190; // type:function size:0x1C -fn_801441B0 = .text:0x801441B0; // type:function size:0x1C -fn_801441D0 = .text:0x801441D0; // type:function size:0x1C -fn_801441F0 = .text:0x801441F0; // type:function size:0x1C -fn_80144210 = .text:0x80144210; // type:function size:0x1C -fn_80144230 = .text:0x80144230; // type:function size:0x1C -fn_80144250 = .text:0x80144250; // type:function size:0x1C -fn_80144270 = .text:0x80144270; // type:function size:0x1C -fn_80144290 = .text:0x80144290; // type:function size:0x1C -fn_801442B0 = .text:0x801442B0; // type:function size:0x1C -fn_801442D0 = .text:0x801442D0; // type:function size:0x1C -fn_801442F0 = .text:0x801442F0; // type:function size:0x10 -fn_80144300 = .text:0x80144300; // type:function size:0x10 -fn_80144310 = .text:0x80144310; // type:function size:0x10 -fn_80144320 = .text:0x80144320; // type:function size:0x10 -fn_80144330 = .text:0x80144330; // type:function size:0x10 -fn_80144340 = .text:0x80144340; // type:function size:0x10 -fn_80144350 = .text:0x80144350; // type:function size:0x10 -fn_80144360 = .text:0x80144360; // type:function size:0x10 -fn_80144370 = .text:0x80144370; // type:function size:0x10 -fn_80144380 = .text:0x80144380; // type:function size:0x10 -fn_80144390 = .text:0x80144390; // type:function size:0x10 -fn_801443A0 = .text:0x801443A0; // type:function size:0x10 -fn_801443B0 = .text:0x801443B0; // type:function size:0x10 -fn_801443C0 = .text:0x801443C0; // type:function size:0x10 -fn_801443D0 = .text:0x801443D0; // type:function size:0x10 -fn_801443E0 = .text:0x801443E0; // type:function size:0x10 -fn_801443F0 = .text:0x801443F0; // type:function size:0x10 -fn_80144400 = .text:0x80144400; // type:function size:0x10 -fn_80144410 = .text:0x80144410; // type:function size:0x10 -fn_80144420 = .text:0x80144420; // type:function size:0x10 -fn_80144430 = .text:0x80144430; // type:function size:0x10 -fn_80144440 = .text:0x80144440; // type:function size:0x10 -fn_80144450 = .text:0x80144450; // type:function size:0x10 -fn_80144460 = .text:0x80144460; // type:function size:0x10 -fn_80144470 = .text:0x80144470; // type:function size:0x10 -fn_80144480 = .text:0x80144480; // type:function size:0x10 -fn_80144490 = .text:0x80144490; // type:function size:0x10 -fn_801444A0 = .text:0x801444A0; // type:function size:0x10 -fn_801444B0 = .text:0x801444B0; // type:function size:0x10 -fn_801444C0 = .text:0x801444C0; // type:function size:0x10 -fn_801444D0 = .text:0x801444D0; // type:function size:0x10 -fn_801444E0 = .text:0x801444E0; // type:function size:0x10 -fn_801444F0 = .text:0x801444F0; // type:function size:0x10 -fn_80144500 = .text:0x80144500; // type:function size:0x10 -fn_80144510 = .text:0x80144510; // type:function size:0x10 -fn_80144520 = .text:0x80144520; // type:function size:0x10 -fn_80144530 = .text:0x80144530; // type:function size:0x10 -fn_80144540 = .text:0x80144540; // type:function size:0x10 -fn_80144550 = .text:0x80144550; // type:function size:0x10 -fn_80144560 = .text:0x80144560; // type:function size:0x10 -fn_80144570 = .text:0x80144570; // type:function size:0x10 -fn_80144580 = .text:0x80144580; // type:function size:0x10 -fn_80144590 = .text:0x80144590; // type:function size:0x10 -fn_801445A0 = .text:0x801445A0; // type:function size:0x10 -fn_801445B0 = .text:0x801445B0; // type:function size:0x10 -fn_801445C0 = .text:0x801445C0; // type:function size:0x10 -fn_801445D0 = .text:0x801445D0; // type:function size:0x10 -fn_801445E0 = .text:0x801445E0; // type:function size:0x10 -fn_801445F0 = .text:0x801445F0; // type:function size:0x10 -fn_80144600 = .text:0x80144600; // type:function size:0x10 -fn_80144610 = .text:0x80144610; // type:function size:0x10 -fn_80144620 = .text:0x80144620; // type:function size:0x10 -fn_80144630 = .text:0x80144630; // type:function size:0x10 -fn_80144640 = .text:0x80144640; // type:function size:0x10 -fn_80144650 = .text:0x80144650; // type:function size:0x10 -fn_80144660 = .text:0x80144660; // type:function size:0x10 -fn_80144670 = .text:0x80144670; // type:function size:0x10 -fn_80144680 = .text:0x80144680; // type:function size:0x10 -fn_80144690 = .text:0x80144690; // type:function size:0x10 -fn_801446A0 = .text:0x801446A0; // type:function size:0x10 -fn_801446B0 = .text:0x801446B0; // type:function size:0x10 -fn_801446C0 = .text:0x801446C0; // type:function size:0x10 -fn_801446D0 = .text:0x801446D0; // type:function size:0x10 -fn_801446E0 = .text:0x801446E0; // type:function size:0x10 -fn_801446F0 = .text:0x801446F0; // type:function size:0x10 -fn_80144700 = .text:0x80144700; // type:function size:0x30 -fn_80144730 = .text:0x80144730; // type:function size:0x30 -fn_80144760 = .text:0x80144760; // type:function size:0x30 -fn_80144790 = .text:0x80144790; // type:function size:0x30 -fn_801447C0 = .text:0x801447C0; // type:function size:0x30 -fn_801447F0 = .text:0x801447F0; // type:function size:0x30 -fn_80144820 = .text:0x80144820; // type:function size:0x30 -fn_80144850 = .text:0x80144850; // type:function size:0x30 -fn_80144880 = .text:0x80144880; // type:function size:0x30 -fn_801448B0 = .text:0x801448B0; // type:function size:0x30 -fn_801448E0 = .text:0x801448E0; // type:function size:0x30 -fn_80144910 = .text:0x80144910; // type:function size:0x30 -fn_80144940 = .text:0x80144940; // type:function size:0x30 -fn_80144970 = .text:0x80144970; // type:function size:0x30 -fn_801449A0 = .text:0x801449A0; // type:function size:0x30 -fn_801449D0 = .text:0x801449D0; // type:function size:0x30 -fn_80144A00 = .text:0x80144A00; // type:function size:0x30 -fn_80144A30 = .text:0x80144A30; // type:function size:0x30 -fn_80144A60 = .text:0x80144A60; // type:function size:0x30 -fn_80144A90 = .text:0x80144A90; // type:function size:0x30 -fn_80144AC0 = .text:0x80144AC0; // type:function size:0x30 -fn_80144AF0 = .text:0x80144AF0; // type:function size:0x30 -fn_80144B20 = .text:0x80144B20; // type:function size:0x30 -fn_80144B50 = .text:0x80144B50; // type:function size:0x30 -fn_80144B80 = .text:0x80144B80; // type:function size:0x30 -fn_80144BB0 = .text:0x80144BB0; // type:function size:0x30 -fn_80144BE0 = .text:0x80144BE0; // type:function size:0x30 +build__29sFStateFct_c<13dLytMapMain_c>FRC12sStateIDIf_c = .text:0x80143AD0; // type:function size:0x60 +dispose__29sFStateFct_c<13dLytMapMain_c>FRP10sStateIf_c = .text:0x80143B30; // type:function size:0xC +build__32sFStateFct_c<16dLytMapSaveObj_c>FRC12sStateIDIf_c = .text:0x80143B40; // type:function size:0x60 +dispose__32sFStateFct_c<16dLytMapSaveObj_c>FRP10sStateIf_c = .text:0x80143BA0; // type:function size:0xC +build__36sFStateFct_c<20dLytMapSaveCaption_c>FRC12sStateIDIf_c = .text:0x80143BB0; // type:function size:0x60 +dispose__36sFStateFct_c<20dLytMapSaveCaption_c>FRP10sStateIf_c = .text:0x80143C10; // type:function size:0xC +build__40sFStateFct_c<24dLytMapSavePopupAction_c>FRC12sStateIDIf_c = .text:0x80143C20; // type:function size:0x60 +dispose__40sFStateFct_c<24dLytMapSavePopupAction_c>FRP10sStateIf_c = .text:0x80143C80; // type:function size:0xC +build__34sFStateFct_c<18dLytMapPopupInfo_c>FRC12sStateIDIf_c = .text:0x80143C90; // type:function size:0x60 +dispose__34sFStateFct_c<18dLytMapPopupInfo_c>FRP10sStateIf_c = .text:0x80143CF0; // type:function size:0xC +build__36sFStateFct_c<20dLytMapFloorBtnMgr_c>FRC12sStateIDIf_c = .text:0x80143D00; // type:function size:0x60 +dispose__36sFStateFct_c<20dLytMapFloorBtnMgr_c>FRP10sStateIf_c = .text:0x80143D60; // type:function size:0xC +build__33sFStateFct_c<17dLytMapFloorBtn_c>FRC12sStateIDIf_c = .text:0x80143D70; // type:function size:0x60 +dispose__33sFStateFct_c<17dLytMapFloorBtn_c>FRP10sStateIf_c = .text:0x80143DD0; // type:function size:0xC +build__41sFStateFct_c<25dLytMapPinIconAggregate_c>FRC12sStateIDIf_c = .text:0x80143DE0; // type:function size:0x60 +dispose__41sFStateFct_c<25dLytMapPinIconAggregate_c>FRP10sStateIf_c = .text:0x80143E40; // type:function size:0xC +build__32sFStateFct_c<16dLytMapPinIcon_c>FRC12sStateIDIf_c = .text:0x80143E50; // type:function size:0x60 +dispose__32sFStateFct_c<16dLytMapPinIcon_c>FRP10sStateIf_c = .text:0x80143EB0; // type:function size:0xC +build__32sFStateFct_c<16dLytMapCapture_c>FRC12sStateIDIf_c = .text:0x80143EC0; // type:function size:0x60 +dispose__32sFStateFct_c<16dLytMapCapture_c>FRP10sStateIf_c = .text:0x80143F20; // type:function size:0xC +initialize__26sFState_c<13dLytMapMain_c>Fv = .text:0x80143F30; // type:function size:0x1C +execute__26sFState_c<13dLytMapMain_c>Fv = .text:0x80143F50; // type:function size:0x1C +finalize__26sFState_c<13dLytMapMain_c>Fv = .text:0x80143F70; // type:function size:0x1C +initialize__29sFState_c<16dLytMapSaveObj_c>Fv = .text:0x80143F90; // type:function size:0x1C +execute__29sFState_c<16dLytMapSaveObj_c>Fv = .text:0x80143FB0; // type:function size:0x1C +finalize__29sFState_c<16dLytMapSaveObj_c>Fv = .text:0x80143FD0; // type:function size:0x1C +initialize__33sFState_c<20dLytMapSaveCaption_c>Fv = .text:0x80143FF0; // type:function size:0x1C +execute__33sFState_c<20dLytMapSaveCaption_c>Fv = .text:0x80144010; // type:function size:0x1C +finalize__33sFState_c<20dLytMapSaveCaption_c>Fv = .text:0x80144030; // type:function size:0x1C +initialize__37sFState_c<24dLytMapSavePopupAction_c>Fv = .text:0x80144050; // type:function size:0x1C +execute__37sFState_c<24dLytMapSavePopupAction_c>Fv = .text:0x80144070; // type:function size:0x1C +finalize__37sFState_c<24dLytMapSavePopupAction_c>Fv = .text:0x80144090; // type:function size:0x1C +initialize__31sFState_c<18dLytMapPopupInfo_c>Fv = .text:0x801440B0; // type:function size:0x1C +execute__31sFState_c<18dLytMapPopupInfo_c>Fv = .text:0x801440D0; // type:function size:0x1C +finalize__31sFState_c<18dLytMapPopupInfo_c>Fv = .text:0x801440F0; // type:function size:0x1C +initialize__33sFState_c<20dLytMapFloorBtnMgr_c>Fv = .text:0x80144110; // type:function size:0x1C +execute__33sFState_c<20dLytMapFloorBtnMgr_c>Fv = .text:0x80144130; // type:function size:0x1C +finalize__33sFState_c<20dLytMapFloorBtnMgr_c>Fv = .text:0x80144150; // type:function size:0x1C +initialize__30sFState_c<17dLytMapFloorBtn_c>Fv = .text:0x80144170; // type:function size:0x1C +execute__30sFState_c<17dLytMapFloorBtn_c>Fv = .text:0x80144190; // type:function size:0x1C +finalize__30sFState_c<17dLytMapFloorBtn_c>Fv = .text:0x801441B0; // type:function size:0x1C +initialize__38sFState_c<25dLytMapPinIconAggregate_c>Fv = .text:0x801441D0; // type:function size:0x1C +execute__38sFState_c<25dLytMapPinIconAggregate_c>Fv = .text:0x801441F0; // type:function size:0x1C +finalize__38sFState_c<25dLytMapPinIconAggregate_c>Fv = .text:0x80144210; // type:function size:0x1C +initialize__29sFState_c<16dLytMapPinIcon_c>Fv = .text:0x80144230; // type:function size:0x1C +execute__29sFState_c<16dLytMapPinIcon_c>Fv = .text:0x80144250; // type:function size:0x1C +finalize__29sFState_c<16dLytMapPinIcon_c>Fv = .text:0x80144270; // type:function size:0x1C +initialize__29sFState_c<16dLytMapCapture_c>Fv = .text:0x80144290; // type:function size:0x1C +execute__29sFState_c<16dLytMapCapture_c>Fv = .text:0x801442B0; // type:function size:0x1C +finalize__29sFState_c<16dLytMapCapture_c>Fv = .text:0x801442D0; // type:function size:0x1C +initializeState__82sStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801442F0; // type:function size:0x10 +executeState__82sStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144300; // type:function size:0x10 +finalizeState__82sStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144310; // type:function size:0x10 +refreshState__82sStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144320; // type:function size:0x10 +getState__82sStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144330; // type:function size:0x10 +getNewStateID__82sStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144340; // type:function size:0x10 +getStateID__82sStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144350; // type:function size:0x10 +getOldStateID__82sStateMgr_c<13dLytMapMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144360; // type:function size:0x10 +initializeState__85sStateMgr_c<16dLytMapSaveObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144370; // type:function size:0x10 +finalizeState__85sStateMgr_c<16dLytMapSaveObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144380; // type:function size:0x10 +refreshState__85sStateMgr_c<16dLytMapSaveObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144390; // type:function size:0x10 +getState__85sStateMgr_c<16dLytMapSaveObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801443A0; // type:function size:0x10 +getNewStateID__85sStateMgr_c<16dLytMapSaveObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801443B0; // type:function size:0x10 +getOldStateID__85sStateMgr_c<16dLytMapSaveObj_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801443C0; // type:function size:0x10 +initializeState__89sStateMgr_c<20dLytMapSaveCaption_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801443D0; // type:function size:0x10 +finalizeState__89sStateMgr_c<20dLytMapSaveCaption_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801443E0; // type:function size:0x10 +refreshState__89sStateMgr_c<20dLytMapSaveCaption_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801443F0; // type:function size:0x10 +getState__89sStateMgr_c<20dLytMapSaveCaption_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144400; // type:function size:0x10 +getNewStateID__89sStateMgr_c<20dLytMapSaveCaption_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144410; // type:function size:0x10 +getOldStateID__89sStateMgr_c<20dLytMapSaveCaption_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144420; // type:function size:0x10 +initializeState__93sStateMgr_c<24dLytMapSavePopupAction_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144430; // type:function size:0x10 +finalizeState__93sStateMgr_c<24dLytMapSavePopupAction_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144440; // type:function size:0x10 +refreshState__93sStateMgr_c<24dLytMapSavePopupAction_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144450; // type:function size:0x10 +getState__93sStateMgr_c<24dLytMapSavePopupAction_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144460; // type:function size:0x10 +getNewStateID__93sStateMgr_c<24dLytMapSavePopupAction_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144470; // type:function size:0x10 +getOldStateID__93sStateMgr_c<24dLytMapSavePopupAction_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144480; // type:function size:0x10 +initializeState__87sStateMgr_c<18dLytMapPopupInfo_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144490; // type:function size:0x10 +finalizeState__87sStateMgr_c<18dLytMapPopupInfo_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801444A0; // type:function size:0x10 +refreshState__87sStateMgr_c<18dLytMapPopupInfo_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801444B0; // type:function size:0x10 +getState__87sStateMgr_c<18dLytMapPopupInfo_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801444C0; // type:function size:0x10 +getNewStateID__87sStateMgr_c<18dLytMapPopupInfo_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801444D0; // type:function size:0x10 +getStateID__87sStateMgr_c<18dLytMapPopupInfo_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801444E0; // type:function size:0x10 +getOldStateID__87sStateMgr_c<18dLytMapPopupInfo_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801444F0; // type:function size:0x10 +initializeState__89sStateMgr_c<20dLytMapFloorBtnMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144500; // type:function size:0x10 +finalizeState__89sStateMgr_c<20dLytMapFloorBtnMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144510; // type:function size:0x10 +refreshState__89sStateMgr_c<20dLytMapFloorBtnMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144520; // type:function size:0x10 +getState__89sStateMgr_c<20dLytMapFloorBtnMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144530; // type:function size:0x10 +getNewStateID__89sStateMgr_c<20dLytMapFloorBtnMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144540; // type:function size:0x10 +getOldStateID__89sStateMgr_c<20dLytMapFloorBtnMgr_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144550; // type:function size:0x10 +initializeState__86sStateMgr_c<17dLytMapFloorBtn_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144560; // type:function size:0x10 +finalizeState__86sStateMgr_c<17dLytMapFloorBtn_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144570; // type:function size:0x10 +refreshState__86sStateMgr_c<17dLytMapFloorBtn_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144580; // type:function size:0x10 +getState__86sStateMgr_c<17dLytMapFloorBtn_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144590; // type:function size:0x10 +getNewStateID__86sStateMgr_c<17dLytMapFloorBtn_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801445A0; // type:function size:0x10 +getOldStateID__86sStateMgr_c<17dLytMapFloorBtn_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801445B0; // type:function size:0x10 +initializeState__94sStateMgr_c<25dLytMapPinIconAggregate_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801445C0; // type:function size:0x10 +finalizeState__94sStateMgr_c<25dLytMapPinIconAggregate_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801445D0; // type:function size:0x10 +refreshState__94sStateMgr_c<25dLytMapPinIconAggregate_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801445E0; // type:function size:0x10 +getState__94sStateMgr_c<25dLytMapPinIconAggregate_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801445F0; // type:function size:0x10 +getNewStateID__94sStateMgr_c<25dLytMapPinIconAggregate_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144600; // type:function size:0x10 +getOldStateID__94sStateMgr_c<25dLytMapPinIconAggregate_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144610; // type:function size:0x10 +initializeState__85sStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144620; // type:function size:0x10 +finalizeState__85sStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144630; // type:function size:0x10 +refreshState__85sStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144640; // type:function size:0x10 +getState__85sStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144650; // type:function size:0x10 +getNewStateID__85sStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144660; // type:function size:0x10 +getOldStateID__85sStateMgr_c<16dLytMapPinIcon_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80144670; // type:function size:0x10 +initializeState__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144680; // type:function size:0x10 +executeState__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80144690; // type:function size:0x10 +finalizeState__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801446A0; // type:function size:0x10 +refreshState__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x801446B0; // type:function size:0x10 +getState__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801446C0; // type:function size:0x10 +getNewStateID__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801446D0; // type:function size:0x10 +getStateID__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801446E0; // type:function size:0x10 +getOldStateID__85sStateMgr_c<16dLytMapCapture_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x801446F0; // type:function size:0x10 +finalizeState__31sFStateID_c<16dLytMapPinIcon_c>CFR16dLytMapPinIcon_c = .text:0x80144700; // type:function size:0x30 +executeState__31sFStateID_c<16dLytMapPinIcon_c>CFR16dLytMapPinIcon_c = .text:0x80144730; // type:function size:0x30 +initializeState__31sFStateID_c<16dLytMapPinIcon_c>CFR16dLytMapPinIcon_c = .text:0x80144760; // type:function size:0x30 +finalizeState__40sFStateID_c<25dLytMapPinIconAggregate_c>CFR25dLytMapPinIconAggregate_c = .text:0x80144790; // type:function size:0x30 +executeState__40sFStateID_c<25dLytMapPinIconAggregate_c>CFR25dLytMapPinIconAggregate_c = .text:0x801447C0; // type:function size:0x30 +initializeState__40sFStateID_c<25dLytMapPinIconAggregate_c>CFR25dLytMapPinIconAggregate_c = .text:0x801447F0; // type:function size:0x30 +finalizeState__32sFStateID_c<17dLytMapFloorBtn_c>CFR17dLytMapFloorBtn_c = .text:0x80144820; // type:function size:0x30 +executeState__32sFStateID_c<17dLytMapFloorBtn_c>CFR17dLytMapFloorBtn_c = .text:0x80144850; // type:function size:0x30 +initializeState__32sFStateID_c<17dLytMapFloorBtn_c>CFR17dLytMapFloorBtn_c = .text:0x80144880; // type:function size:0x30 +finalizeState__35sFStateID_c<20dLytMapFloorBtnMgr_c>CFR20dLytMapFloorBtnMgr_c = .text:0x801448B0; // type:function size:0x30 +executeState__35sFStateID_c<20dLytMapFloorBtnMgr_c>CFR20dLytMapFloorBtnMgr_c = .text:0x801448E0; // type:function size:0x30 +initializeState__35sFStateID_c<20dLytMapFloorBtnMgr_c>CFR20dLytMapFloorBtnMgr_c = .text:0x80144910; // type:function size:0x30 +finalizeState__33sFStateID_c<18dLytMapPopupInfo_c>CFR18dLytMapPopupInfo_c = .text:0x80144940; // type:function size:0x30 +executeState__33sFStateID_c<18dLytMapPopupInfo_c>CFR18dLytMapPopupInfo_c = .text:0x80144970; // type:function size:0x30 +initializeState__33sFStateID_c<18dLytMapPopupInfo_c>CFR18dLytMapPopupInfo_c = .text:0x801449A0; // type:function size:0x30 +finalizeState__39sFStateID_c<24dLytMapSavePopupAction_c>CFR24dLytMapSavePopupAction_c = .text:0x801449D0; // type:function size:0x30 +executeState__39sFStateID_c<24dLytMapSavePopupAction_c>CFR24dLytMapSavePopupAction_c = .text:0x80144A00; // type:function size:0x30 +initializeState__39sFStateID_c<24dLytMapSavePopupAction_c>CFR24dLytMapSavePopupAction_c = .text:0x80144A30; // type:function size:0x30 +finalizeState__35sFStateID_c<20dLytMapSaveCaption_c>CFR20dLytMapSaveCaption_c = .text:0x80144A60; // type:function size:0x30 +executeState__35sFStateID_c<20dLytMapSaveCaption_c>CFR20dLytMapSaveCaption_c = .text:0x80144A90; // type:function size:0x30 +initializeState__35sFStateID_c<20dLytMapSaveCaption_c>CFR20dLytMapSaveCaption_c = .text:0x80144AC0; // type:function size:0x30 +finalizeState__31sFStateID_c<16dLytMapSaveObj_c>CFR16dLytMapSaveObj_c = .text:0x80144AF0; // type:function size:0x30 +executeState__31sFStateID_c<16dLytMapSaveObj_c>CFR16dLytMapSaveObj_c = .text:0x80144B20; // type:function size:0x30 +initializeState__31sFStateID_c<16dLytMapSaveObj_c>CFR16dLytMapSaveObj_c = .text:0x80144B50; // type:function size:0x30 +finalizeState__28sFStateID_c<13dLytMapMain_c>CFR13dLytMapMain_c = .text:0x80144B80; // type:function size:0x30 +executeState__28sFStateID_c<13dLytMapMain_c>CFR13dLytMapMain_c = .text:0x80144BB0; // type:function size:0x30 +initializeState__28sFStateID_c<13dLytMapMain_c>CFR13dLytMapMain_c = .text:0x80144BE0; // type:function size:0x30 __sinit_\d_lyt_map_cpp = .text:0x80144C10; // type:function size:0x3968 scope:local -LytMapPinIcon__dtor = .text:0x80148580; // type:function size:0x58 -LytMapPinIconAggregate__dtor = .text:0x801485E0; // type:function size:0x58 -LytMapFloorBtn__dtor = .text:0x80148640; // type:function size:0x58 -LytMapFloorBtnMgr__dtor = .text:0x801486A0; // type:function size:0x58 -LytMapPopupInfo__dtor = .text:0x80148700; // type:function size:0x58 -LytMapSavePopupAction__dtor = .text:0x80148760; // type:function size:0x58 -LytMapSaveCaption__dtor = .text:0x801487C0; // type:function size:0x58 -LytMapSaveObj__dtor = .text:0x80148820; // type:function size:0x58 -LytMapMain__dtor = .text:0x80148880; // type:function size:0x58 -fn_801488E0 = .text:0x801488E0; // type:function size:0x88 -fn_80148970 = .text:0x80148970; // type:function size:0x88 -fn_80148A00 = .text:0x80148A00; // type:function size:0x88 -fn_80148A90 = .text:0x80148A90; // type:function size:0x88 -fn_80148B20 = .text:0x80148B20; // type:function size:0x88 -fn_80148BB0 = .text:0x80148BB0; // type:function size:0x88 -fn_80148C40 = .text:0x80148C40; // type:function size:0x88 -fn_80148CD0 = .text:0x80148CD0; // type:function size:0x88 -fn_80148D60 = .text:0x80148D60; // type:function size:0x88 +__dt__31sFStateID_c<16dLytMapPinIcon_c>Fv = .text:0x80148580; // type:function size:0x58 +__dt__40sFStateID_c<25dLytMapPinIconAggregate_c>Fv = .text:0x801485E0; // type:function size:0x58 +__dt__32sFStateID_c<17dLytMapFloorBtn_c>Fv = .text:0x80148640; // type:function size:0x58 +__dt__35sFStateID_c<20dLytMapFloorBtnMgr_c>Fv = .text:0x801486A0; // type:function size:0x58 +__dt__33sFStateID_c<18dLytMapPopupInfo_c>Fv = .text:0x80148700; // type:function size:0x58 +__dt__39sFStateID_c<24dLytMapSavePopupAction_c>Fv = .text:0x80148760; // type:function size:0x58 +__dt__35sFStateID_c<20dLytMapSaveCaption_c>Fv = .text:0x801487C0; // type:function size:0x58 +__dt__31sFStateID_c<16dLytMapSaveObj_c>Fv = .text:0x80148820; // type:function size:0x58 +__dt__28sFStateID_c<13dLytMapMain_c>Fv = .text:0x80148880; // type:function size:0x58 +isSameName__28sFStateID_c<13dLytMapMain_c>CFPCc = .text:0x801488E0; // type:function size:0x88 +isSameName__31sFStateID_c<16dLytMapSaveObj_c>CFPCc = .text:0x80148970; // type:function size:0x88 +isSameName__35sFStateID_c<20dLytMapSaveCaption_c>CFPCc = .text:0x80148A00; // type:function size:0x88 +isSameName__39sFStateID_c<24dLytMapSavePopupAction_c>CFPCc = .text:0x80148A90; // type:function size:0x88 +isSameName__33sFStateID_c<18dLytMapPopupInfo_c>CFPCc = .text:0x80148B20; // type:function size:0x88 +isSameName__35sFStateID_c<20dLytMapFloorBtnMgr_c>CFPCc = .text:0x80148BB0; // type:function size:0x88 +isSameName__32sFStateID_c<17dLytMapFloorBtn_c>CFPCc = .text:0x80148C40; // type:function size:0x88 +isSameName__40sFStateID_c<25dLytMapPinIconAggregate_c>CFPCc = .text:0x80148CD0; // type:function size:0x88 +isSameName__31sFStateID_c<16dLytMapPinIcon_c>CFPCc = .text:0x80148D60; // type:function size:0x88 initializeState_Wait__10dLytNote_cFv = .text:0x80148DF0; // type:function size:0xC executeState_Wait__10dLytNote_cFv = .text:0x80148E00; // type:function size:0x28 changeState__79sStateMgr_c<10dLytNote_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x80148E30; // type:function size:0x10 @@ -39974,7 +39974,7 @@ lbl_8057548C = .sbss:0x8057548C; // type:object size:0x4 data:4byte CURRENT_ACTOR_EVENT_FLOW_MANAGER = .sbss:0x80575490; // type:object size:0x8 data:4byte LYT_SIMPLE_WINDOW = .sbss:0x80575498; // type:object size:0x8 data:4byte lbl_805754A0 = .sbss:0x805754A0; // type:object size:0x8 data:4byte -lbl_805754A8 = .sbss:0x805754A8; // type:object size:0x1 data:byte +sMapFaderColor = .sbss:0x805754A8; // type:object size:0x4 data:byte lbl_805754AC = .sbss:0x805754AC; // type:object size:0x1 data:byte lbl_805754B0 = .sbss:0x805754B0; // type:object size:0x8 data:4byte sInstance__13dLytBattery_c = .sbss:0x805754B8; // type:object size:0x8 data:4byte @@ -48687,63 +48687,84 @@ StateID_RenderingWait__16dLytMapCapture_c = .bss:0x805AF400; // type:object size StateID_RenderingWaitStep2__16dLytMapCapture_c = .bss:0x805AF440; // type:object size:0x30 data:4byte lbl_805AF470 = .bss:0x805AF470; // type:object size:0x10 lbl_805AF480 = .bss:0x805AF480; // type:object size:0x40 -LytMapPinIcon__STATE_WAIT = .bss:0x805AF4C0; // type:object size:0x40 data:4byte -LytMapPinIcon__STATE_TO_SELECT = .bss:0x805AF500; // type:object size:0x40 data:4byte -LytMapPinIcon__STATE_SELECT = .bss:0x805AF540; // type:object size:0x40 data:4byte -lbl_805AF580 = .bss:0x805AF580; // type:object size:0x40 data:4byte -LytMapPinIcon__STATE_REMOVE = .bss:0x805AF5C0; // type:object size:0x40 data:4byte -LytMapPinIconAggregate__STATE_WAIT = .bss:0x805AF600; // type:object size:0x40 data:4byte -LytMapPinIconAggregate__STATE_SELECT = .bss:0x805AF640; // type:object size:0x80 data:4byte -LytMapPinIconAggregate__STATE_REMOVE = .bss:0x805AF6C0; // type:object size:0x40 data:4byte -LytMapPinIconAggregate__STATE_TO_SELECT = .bss:0x805AF700; // type:object size:0x40 data:4byte -LytMapFloorBtn__STATE_SELECT = .bss:0x805AF740; // type:object size:0x40 data:4byte -LytMapFloorBtn__STATE_TO_WAIT = .bss:0x805AF780; // type:object size:0x40 data:4byte -LytMapFloorBtn__STATE_TO_DECIDE = .bss:0x805AF7C0; // type:object size:0x40 data:4byte -LytMapFloorBtn__STATE_DECIDE = .bss:0x805AF800; // type:object size:0x40 data:4byte -LytMapFloorBtn__STATE_TO_SELECT_IN_DECIDE = .bss:0x805AF840; // type:object size:0x40 data:4byte -LytMapFloorBtn__STATE_SELECT_IN_DECIDE = .bss:0x805AF880; // type:object size:0x40 data:4byte -LytMapFloorBtnMgr__STATE_DECIDE_TO_SELECT_IN_DECIDE = .bss:0x805AF8C0; // type:object size:0x40 data:4byte -LytMapFloorBtnMgr__STATE_INVISIBLE = .bss:0x805AF900; // type:object size:0x80 data:4byte -LytMapPopupInfo__STATE_INVISIBLE = .bss:0x805AF980; // type:object size:0x40 data:4byte -LytMapPopupInfo__STATE_IN = .bss:0x805AF9C0; // type:object size:0x40 data:4byte -LytMapPopupInfo__STATE_WAIT = .bss:0x805AFA00; // type:object size:0x40 data:4byte -LytMapPopupInfo__STATE_WAIT_INVALID = .bss:0x805AFA40; // type:object size:0x40 data:4byte -LytMapPopupInfo__STATE_OUT = .bss:0x805AFA80; // type:object size:0x40 data:4byte -LytMapSavePopupAction__STATE_INVISIBLE = .bss:0x805AFAC0; // type:object size:0x40 data:4byte -LytMapSavePopupAction__STATE_IN = .bss:0x805AFB00; // type:object size:0x40 data:4byte -LytMapSavePopupAction__STATE_WAIT = .bss:0x805AFB40; // type:object size:0x40 data:4byte -LytMapSavePopupAction__STATE_OUT = .bss:0x805AFB80; // type:object size:0x40 data:4byte -LytMapSaveCaption__STATE_INVISIBLE = .bss:0x805AFBC0; // type:object size:0x80 data:4byte -LytMapSaveCaption__STATE_WAIT = .bss:0x805AFC40; // type:object size:0x80 data:4byte -LytMapSaveObj__STATE_WAIT = .bss:0x805AFCC0; // type:object size:0x40 data:4byte -LytMapSaveObj__STATE_TO_HISTORY = .bss:0x805AFD00; // type:object size:0x40 data:4byte -LytMapSaveObj__STATE_SELECT = .bss:0x805AFD40; // type:object size:0x40 data:4byte -LytMapSaveObj__STATE_TO_WAIT = .bss:0x805AFD80; // type:object size:0x40 data:4byte -LytMapSaveObj__STATE_TO_DECIDE = .bss:0x805AFDC0; // type:object size:0x40 data:4byte -LytMapMain__STATE_INVISIBLE = .bss:0x805AFE00; // type:object size:0x40 data:4byte -LytMapMain__STATE_RENDERING_WAIT = .bss:0x805AFE40; // type:object size:0x40 data:4byte -LytMapMain__STATE_IN = .bss:0x805AFE80; // type:object size:0x40 data:4byte -LytMapMain__STATE_ACTIVE = .bss:0x805AFEC0; // type:object size:0x40 data:4byte -LytMapMain__STATE_OUT = .bss:0x805AFF00; // type:object size:0x100 data:4byte -LytMapMain__STATE_CHG_DISP_AREA_MODE_MAP_ROT = .bss:0x805B0000; // type:object size:0x40 data:4byte -LytMapMain__STATE_CHG_DISP_AREA_MODE_WA = .bss:0x805B0040; // type:object size:0x80 data:4byte -LytMapMain__STATE_RESET_POS = .bss:0x805B00C0; // type:object size:0xC0 data:4byte -LytMapMain__STATE_EVENT_SW_BANK_SMALL_2 = .bss:0x805B0180; // type:object size:0x40 data:4byte -LytMapMain__STATE_EVENT_SW_BANK_SMALL_3 = .bss:0x805B01C0; // type:object size:0x80 data:4byte -LytMapMain__STATE_EVENT_MAP_INTO_STEP_2 = .bss:0x805B0240; // type:object size:0x40 data:4byte -LytMapMain__STATE_EVENT_MAP_INTRO_STEP_3 = .bss:0x805B0280; // type:object size:0xC0 data:4byte -LytMapMain__STATE_EVENT_DUNGEON_MAP_GET_STEP_2 = .bss:0x805B0340; // type:object size:0x40 data:4byte -LytMapMain__STATE_EVENT_DUNGEON_MAP_GET_STEP_3 = .bss:0x805B0380; // type:object size:0x80 data:4byte -LytMapMain__STATE_EVENT_FIELD_MAP_CHANGE_STEP_2 = .bss:0x805B0400; // type:object size:0x40 data:4byte -LytMapMain__STATE_EVENT_FIELD_MAP_CHANGE_STEP_3 = .bss:0x805B0440; // type:object size:0x40 data:4byte -LytMapMain__STATE_EVENT_FIELD_MAP_CHANGE_STEP_4 = .bss:0x805B0480; // type:object size:0x80 data:4byte -LytMapMain__STATE_EVENT_FOREST_MAP_CHANGE_STEP_2 = .bss:0x805B0500; // type:object size:0x40 data:4byte -LytMapMain__STATE_EVENT_FOREST_MAP_CHANGE_STEP_3 = .bss:0x805B0540; // type:object size:0x80 data:4byte -LytMapMain__STATE_EVENT_SIGNAL_ADD_STEP_2 = .bss:0x805B05C0; // type:object size:0x40 data:4byte -LytMapMain__STATE_EVENT_SIGNAL_ADD_STEP_3 = .bss:0x805B0600; // type:object size:0x80 data:4byte -LytMapMain__STATE_EVENT_GODDESS_CUBE_STEP_2 = .bss:0x805B0680; // type:object size:0x40 data:4byte -LytMapMain__STATE_EVENT_GODDESS_CUBE_STEP_3 = .bss:0x805B06C0; // type:object size:0x80 data:4byte -LytMapMain__STATE_EVENT_SAVE_OBJ_SELECT = .bss:0x805B0740; // type:object size:0xF0 data:4byte +StateID_Wait__16dLytMapPinIcon_c = .bss:0x805AF4C0; // type:object size:0x30 data:4byte +StateID_ToSelect__16dLytMapPinIcon_c = .bss:0x805AF500; // type:object size:0x30 data:4byte +StateID_Select__16dLytMapPinIcon_c = .bss:0x805AF540; // type:object size:0x30 data:4byte +StateID_ToUnselect__16dLytMapPinIcon_c = .bss:0x805AF580; // type:object size:0x30 data:4byte +StateID_Remove__16dLytMapPinIcon_c = .bss:0x805AF5C0; // type:object size:0x30 data:4byte +StateID_Wait__25dLytMapPinIconAggregate_c = .bss:0x805AF600; // type:object size:0x30 data:4byte +StateID_Select__25dLytMapPinIconAggregate_c = .bss:0x805AF640; // type:object size:0x30 data:4byte +StateID_Remove__25dLytMapPinIconAggregate_c = .bss:0x805AF680; // type:object size:0x30 data:4byte +StateID_Wait__17dLytMapFloorBtn_c = .bss:0x805AF6C0; // type:object size:0x30 data:4byte +StateID_ToSelect__17dLytMapFloorBtn_c = .bss:0x805AF700; // type:object size:0x30 data:4byte +StateID_Select__17dLytMapFloorBtn_c = .bss:0x805AF740; // type:object size:0x30 data:4byte +StateID_ToWait__17dLytMapFloorBtn_c = .bss:0x805AF780; // type:object size:0x30 data:4byte +StateID_ToDecide__17dLytMapFloorBtn_c = .bss:0x805AF7C0; // type:object size:0x30 data:4byte +StateID_Decide__17dLytMapFloorBtn_c = .bss:0x805AF800; // type:object size:0x30 data:4byte +StateID_ToSelectInDecide__17dLytMapFloorBtn_c = .bss:0x805AF840; // type:object size:0x30 data:4byte +StateID_SelectInDecide__17dLytMapFloorBtn_c = .bss:0x805AF880; // type:object size:0x30 data:4byte +StateID_DecideToSelectInDecide__17dLytMapFloorBtn_c = .bss:0x805AF8C0; // type:object size:0x30 data:4byte +StateID_Invisible__20dLytMapFloorBtnMgr_c = .bss:0x805AF900; // type:object size:0x30 data:4byte +StateID_Wait__20dLytMapFloorBtnMgr_c = .bss:0x805AF940; // type:object size:0x30 data:4byte +StateID_Invisible__18dLytMapPopupInfo_c = .bss:0x805AF980; // type:object size:0x30 data:4byte +StateID_In__18dLytMapPopupInfo_c = .bss:0x805AF9C0; // type:object size:0x30 data:4byte +StateID_Wait__18dLytMapPopupInfo_c = .bss:0x805AFA00; // type:object size:0x30 data:4byte +StateID_WaitInvalid__18dLytMapPopupInfo_c = .bss:0x805AFA40; // type:object size:0x30 data:4byte +StateID_Out__18dLytMapPopupInfo_c = .bss:0x805AFA80; // type:object size:0x30 data:4byte +StateID_Invisible__24dLytMapSavePopupAction_c = .bss:0x805AFAC0; // type:object size:0x30 data:4byte +StateID_In__24dLytMapSavePopupAction_c = .bss:0x805AFB00; // type:object size:0x30 data:4byte +StateID_Wait__24dLytMapSavePopupAction_c = .bss:0x805AFB40; // type:object size:0x30 data:4byte +StateID_Out__24dLytMapSavePopupAction_c = .bss:0x805AFB80; // type:object size:0x30 data:4byte +StateID_Invisible__20dLytMapSaveCaption_c = .bss:0x805AFBC0; // type:object size:0x30 data:4byte +StateID_In__20dLytMapSaveCaption_c = .bss:0x805AFC00; // type:object size:0x30 data:4byte +StateID_Wait__20dLytMapSaveCaption_c = .bss:0x805AFC40; // type:object size:0x30 data:4byte +StateID_Out__20dLytMapSaveCaption_c = .bss:0x805AFC80; // type:object size:0x30 data:4byte +StateID_Wait__16dLytMapSaveObj_c = .bss:0x805AFCC0; // type:object size:0x30 data:4byte +StateID_ToSelect__16dLytMapSaveObj_c = .bss:0x805AFD00; // type:object size:0x30 data:4byte +StateID_Select__16dLytMapSaveObj_c = .bss:0x805AFD40; // type:object size:0x30 data:4byte +StateID_ToWait__16dLytMapSaveObj_c = .bss:0x805AFD80; // type:object size:0x30 data:4byte +StateID_Decide__16dLytMapSaveObj_c = .bss:0x805AFDC0; // type:object size:0x30 data:4byte +StateID_Invisible__13dLytMapMain_c = .bss:0x805AFE00; // type:object size:0x30 data:4byte +StateID_RenderingWait__13dLytMapMain_c = .bss:0x805AFE40; // type:object size:0x30 data:4byte +StateID_In__13dLytMapMain_c = .bss:0x805AFE80; // type:object size:0x30 data:4byte +StateID_Active__13dLytMapMain_c = .bss:0x805AFEC0; // type:object size:0x30 data:4byte +StateID_Out__13dLytMapMain_c = .bss:0x805AFF00; // type:object size:0x30 data:4byte +StateID_FloorChange__13dLytMapMain_c = .bss:0x805AFF40; // type:object size:0x30 data:4byte +StateID_ChgMapUpDirection__13dLytMapMain_c = .bss:0x805AFF80; // type:object size:0x30 data:4byte +StateID_ChgDispAreaMode_Map__13dLytMapMain_c = .bss:0x805AFFC0; // type:object size:0x30 data:4byte +StateID_ChgDispAreaMode_MapRot__13dLytMapMain_c = .bss:0x805B0000; // type:object size:0x30 data:4byte +StateID_ChgDispAreaMode_WA__13dLytMapMain_c = .bss:0x805B0040; // type:object size:0x30 data:4byte +StateID_ChgDispAreaMode_CsrRot__13dLytMapMain_c = .bss:0x805B0080; // type:object size:0x30 data:4byte +StateID_ResetPos__13dLytMapMain_c = .bss:0x805B00C0; // type:object size:0x30 data:4byte +StateID_ResetPosWithFloorChange__13dLytMapMain_c = .bss:0x805B0100; // type:object size:0x30 data:4byte +StateID_EventSwBankSmall_Step1__13dLytMapMain_c = .bss:0x805B0140; // type:object size:0x30 data:4byte +StateID_EventSwBankSmall_Step2__13dLytMapMain_c = .bss:0x805B0180; // type:object size:0x30 data:4byte +StateID_EventSwBankSmall_Step3__13dLytMapMain_c = .bss:0x805B01C0; // type:object size:0x30 data:4byte +StateID_EventMapIntro_Step1__13dLytMapMain_c = .bss:0x805B0200; // type:object size:0x30 data:4byte +StateID_EventMapIntro_Step2__13dLytMapMain_c = .bss:0x805B0240; // type:object size:0x30 data:4byte +StateID_EventMapIntro_Step3__13dLytMapMain_c = .bss:0x805B0280; // type:object size:0x30 data:4byte +StateID_EventMapIntro_Step4__13dLytMapMain_c = .bss:0x805B02C0; // type:object size:0x30 data:4byte +StateID_EventDungeonMapGet_Step1__13dLytMapMain_c = .bss:0x805B0300; // type:object size:0x30 data:4byte +StateID_EventDungeonMapGet_Step2__13dLytMapMain_c = .bss:0x805B0340; // type:object size:0x30 data:4byte +StateID_EventDungeonMapGet_Step3__13dLytMapMain_c = .bss:0x805B0380; // type:object size:0x30 data:4byte +StateID_EventFieldMapChange_Step1__13dLytMapMain_c = .bss:0x805B03C0; // type:object size:0x30 data:4byte +StateID_EventFieldMapChange_Step2__13dLytMapMain_c = .bss:0x805B0400; // type:object size:0x30 data:4byte +StateID_EventFieldMapChange_Step3__13dLytMapMain_c = .bss:0x805B0440; // type:object size:0x30 data:4byte +StateID_EventFieldMapChange_Step4__13dLytMapMain_c = .bss:0x805B0480; // type:object size:0x30 data:4byte +StateID_EventForestMapChange_Step1__13dLytMapMain_c = .bss:0x805B04C0; // type:object size:0x30 data:4byte +StateID_EventForestMapChange_Step2__13dLytMapMain_c = .bss:0x805B0500; // type:object size:0x30 data:4byte +StateID_EventForestMapChange_Step3__13dLytMapMain_c = .bss:0x805B0540; // type:object size:0x30 data:4byte +StateID_EventSignalAdd_Step1__13dLytMapMain_c = .bss:0x805B0580; // type:object size:0x30 data:4byte +StateID_EventSignalAdd_Step2__13dLytMapMain_c = .bss:0x805B05C0; // type:object size:0x30 data:4byte +StateID_EventSignalAdd_Step3__13dLytMapMain_c = .bss:0x805B0600; // type:object size:0x30 data:4byte +StateID_EventGoddessCube_Step1__13dLytMapMain_c = .bss:0x805B0640; // type:object size:0x30 data:4byte +StateID_EventGoddessCube_Step2__13dLytMapMain_c = .bss:0x805B0680; // type:object size:0x30 data:4byte +StateID_EventGoddessCube_Step3__13dLytMapMain_c = .bss:0x805B06C0; // type:object size:0x30 data:4byte +StateID_EventSaveObjMsgWindow__13dLytMapMain_c = .bss:0x805B0700; // type:object size:0x30 data:4byte +StateID_EventSaveObjSelect__13dLytMapMain_c = .bss:0x805B0740; // type:object size:0x30 data:4byte +StateID_EventSaveObjConfirmMsgWindow__13dLytMapMain_c = .bss:0x805B0780; // type:object size:0x30 data:4byte +StateID_EventSaveObjDecide__13dLytMapMain_c = .bss:0x805B07C0; // type:object size:0x30 data:4byte +lbl_805B07F0 = .bss:0x805B07F0; // type:object size:0x40 lbl_805B0830 = .bss:0x805B0830; // type:object size:0x10 StateID_Wait__10dLytNote_c = .bss:0x805B0840; // type:object size:0x30 data:4byte StateID_In__10dLytNote_c = .bss:0x805B0880; // type:object size:0x30 data:4byte diff --git a/include/d/lyt/d_lyt_map.h b/include/d/lyt/d_lyt_map.h index 2addd77e..807bd2e7 100644 --- a/include/d/lyt/d_lyt_map.h +++ b/include/d/lyt/d_lyt_map.h @@ -5,6 +5,7 @@ #include "d/lyt/d2d.h" #include "d/lyt/d_lyt_map_capture.h" #include "d/lyt/d_structd.h" +#include "egg/core/eggColorFader.h" #include "m/m2d.h" #include "m/m_vec.h" #include "s/s_State.hpp" @@ -75,6 +76,7 @@ public: dLytMapFloorBtn_c() : mStateMgr(*this, sStateID::null), field_0x3C(0), field_0x40(0), field_0x44(0), field_0x48(0), field_0x4C(0), field_0x4D(0) {} + ~dLytMapFloorBtn_c() {} STATE_FUNC_DECLARE(dLytMapFloorBtn_c, Wait); STATE_FUNC_DECLARE(dLytMapFloorBtn_c, ToSelect); @@ -99,7 +101,7 @@ private: class dLytMapFloorBtnMgr_c : public d2d::dSubPane { public: dLytMapFloorBtnMgr_c(void *arg) : field_0x008(arg), mStateMgr(*this, sStateID::null) {} - virtual ~dLytMapFloorBtnMgr_c(); + virtual ~dLytMapFloorBtnMgr_c() {} virtual bool build(d2d::ResAccIf_c *resAcc) override; virtual bool remove() override; @@ -213,6 +215,8 @@ public: virtual void draw() override; virtual void dLytMapMain_vt0x10(); + void build(); + STATE_FUNC_DECLARE(dLytMapMain_c, Invisible); STATE_FUNC_DECLARE(dLytMapMain_c, RenderingWait); STATE_FUNC_DECLARE(dLytMapMain_c, In); @@ -292,6 +296,19 @@ private: /* 0x8DC8 */ UNKWORD field_0x8DC8; }; +// Made up name +class dLytMapFader_c : public m2d::Base_c { +public: + dLytMapFader_c(); + virtual ~dLytMapFader_c(); + /* vt 0x0C */ virtual void draw() override; + + void calc(); + +private: + /* 0x10 */ EGG::ColorFader mFader; +}; + // Size 0x91FC, inline ctor at 802ccd88 class dLytMap_c { public: @@ -302,6 +319,12 @@ public: sInstance = nullptr; } + static d2d::ResAccIf_c *getResAcc() { + return &sInstance->mResAcc; + } + + void build(); + private: /* 0x0004 */ d2d::ResAccIf_c mResAcc; /* 0x0374 */ dLytMapMain_c mMapMain; diff --git a/include/m/m2d.h b/include/m/m2d.h index a07cdc26..0ecd3f4c 100644 --- a/include/m/m2d.h +++ b/include/m/m2d.h @@ -198,6 +198,9 @@ private: u32 field_0x94; }; + +void getAllocator(); + } // namespace m2d #endif diff --git a/include/sized_string.h b/include/sized_string.h index 9d06409b..c1aac98b 100644 --- a/include/sized_string.h +++ b/include/sized_string.h @@ -78,4 +78,35 @@ struct SizedString { } }; +// TODO this might be a shared template with SizedString but I'm +// not sure how to write the inline functions +template +struct SizedWString { + SizedWString() { + mChars[0] = '\0'; + } + + wchar_t mChars[Size]; + + operator wchar_t *() { + return mChars; + } + + operator const wchar_t *() const { + return mChars; + } + + int sprintf(const wchar_t *fmt, ...) { + va_list args; + va_start(args, fmt); + + int printed = vswprintf(this->mChars, Size, fmt, args); + if (printed != wcslen(this->mChars)) { + this->mChars[0] = '\0'; + } + va_end(list); + return printed; + } +}; + #endif diff --git a/src/d/lyt/d_lyt_map.cpp b/src/d/lyt/d_lyt_map.cpp index 4ad5ea59..f0029750 100644 --- a/src/d/lyt/d_lyt_map.cpp +++ b/src/d/lyt/d_lyt_map.cpp @@ -1,5 +1,75 @@ #include "d/lyt/d_lyt_map.h" +#include "egg/core/eggColorFader.h" +#include "m/m_video.h" +#include "sized_string.h" +#include "toBeSorted/arc_managers/layout_arc_manager.h" + +struct LytMapConfigMaybe { + LytMapConfigMaybe(); + virtual ~LytMapConfigMaybe(); + + /* 0x04 */ f32 field_0x04; + /* 0x08 */ f32 field_0x08; + /* 0x0C */ f32 field_0x0C; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ u8 field_0x18; + /* 0x19 */ u8 field_0x19; + /* 0x1A */ u8 field_0x1A; + /* 0x1B */ u8 field_0x1B; + /* 0x1C */ u8 field_0x1C; + /* 0x1D */ u8 field_0x1D; + /* 0x1E */ u8 field_0x1E; + /* 0x1F */ u8 field_0x1F; + /* 0x20 */ u8 field_0x20; + /* 0x21 */ u8 field_0x21; + /* 0x22 */ u8 field_0x22; + /* 0x23 */ u8 field_0x23; + /* 0x24 */ u8 field_0x24; + /* 0x25 */ u8 field_0x25; + /* 0x26 */ u8 field_0x26; + /* 0x27 */ u8 field_0x27; + /* 0x28 */ u8 field_0x28; + /* 0x29 */ u8 field_0x29; + /* 0x2A */ u8 field_0x2A; + /* 0x2B */ u8 field_0x2B; + /* 0x2C */ f32 field_0x2C; +}; + +LytMapConfigMaybe sLytMapConfig; + +LytMapConfigMaybe::LytMapConfigMaybe() { + field_0x04 = -10.0f; + field_0x10 = 14.0f; + field_0x14 = 32.0f; + field_0x18 = 0; + field_0x19 = 0xFF; + field_0x1A = 0xF; + field_0x1B = 0x12; + field_0x1C = 9; + field_0x2C = 0.0f; + field_0x1D = 0x2D; + field_0x1E = 0x2D; + field_0x1F = 0x1E; + field_0x20 = 0x17; + field_0x21 = 0x5A; + field_0x22 = 0x2D; + field_0x23 = 0x2D; + field_0x24 = 0x35; + field_0x25 = 0x2D; + field_0x26 = 0x5A; + field_0x27 = 0x2D; + field_0x28 = 0x5A; + field_0x29 = 0x5; + field_0x08 = 10.0f; + field_0x0C = 0.4f; + field_0x2A = 0x80; + field_0x2B = 10; +} + +LytMapConfigMaybe::~LytMapConfigMaybe() {} + STATE_DEFINE(dLytMapPinIcon_c, Wait); STATE_DEFINE(dLytMapPinIcon_c, ToSelect); STATE_DEFINE(dLytMapPinIcon_c, Select); @@ -23,7 +93,7 @@ STATE_DEFINE(dLytMapFloorBtn_c, DecideToSelectInDecide); STATE_DEFINE(dLytMapFloorBtnMgr_c, Invisible); STATE_DEFINE(dLytMapFloorBtnMgr_c, Wait); -nw4r::ut::Color sSomeColor(0xFF, 0xFF, 0xFF, 0xFF); +nw4r::ut::Color sMapFaderColor(0xFF, 0xFF, 0xFF, 0xFF); STATE_DEFINE(dLytMapPopupInfo_c, Invisible); STATE_DEFINE(dLytMapPopupInfo_c, In); @@ -88,6 +158,22 @@ STATE_DEFINE(dLytMapMain_c, EventSaveObjSelect); STATE_DEFINE(dLytMapMain_c, EventSaveObjConfirmMsgWindow); STATE_DEFINE(dLytMapMain_c, EventSaveObjDecide); +dLytMapFader_c::dLytMapFader_c() + : mFader( + 0.0f, 0.0f, mVideo::m_video->pRenderMode->fbWidth, mVideo::m_video->pRenderMode->efbHeight, sMapFaderColor, + EGG::ColorFader::STATUS_PREPARE_OUT + ) {} + +dLytMapFader_c::~dLytMapFader_c() {} + +void dLytMapFader_c::calc() { + mFader.calc(); +} + +void dLytMapFader_c::draw() { + mFader.draw(); +} + #pragma dont_inline on dLytMapMain_c::dLytMapMain_c() : mStateMgr(*this), mFloorBtnMgr(&field_0x8DC8) {} #pragma dont_inline reset @@ -96,4 +182,18 @@ dLytMapMain_c::~dLytMapMain_c() {} void dLytMapMain_c::draw() {} -dLytMapFloorBtnMgr_c::~dLytMapFloorBtnMgr_c() {} +extern "C" void fn_80016690(); +void dLytMap_c::build() { + fn_80016690(); + void *data = LayoutArcManager::sInstance->getLoadedData("Map2D"); + mResAcc.attach(data, ""); + mMapMain.build(); + m2d::getAllocator(); + mMapMain.setPriority(0x86); + // TODO there's another thing here at 0x91C0 +} + +void lytMapusesSizedWString() { + static SizedWString<0x20> sString; + sString.sprintf(L"%ld", 0); +}