diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index c80be21a..bc43e7bd 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -7521,22 +7521,22 @@ fn_8012E780 = .text:0x8012E780; // type:function size:0x14
 fn_8012E7A0 = .text:0x8012E7A0; // type:function size:0x24
 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
+initializeState_Wait__16dLytMapPinIcon_cFv = .text:0x8012E840; // type:function size:0x14
+executeState_Wait__16dLytMapPinIcon_cFv = .text:0x8012E860; // type:function size:0x58
 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
-fn_8012E950 = .text:0x8012E950; // type:function size:0x10
-fn_8012E960 = .text:0x8012E960; // type:function size:0x4
-fn_8012E970 = .text:0x8012E970; // type:function size:0x12C
-fn_8012EAA0 = .text:0x8012EAA0; // type:function size:0x4
-fn_8012EAB0 = .text:0x8012EAB0; // type:function size:0x4
-fn_8012EAC0 = .text:0x8012EAC0; // type:function size:0x18
-fn_8012EAE0 = .text:0x8012EAE0; // type:function size:0x10
-fn_8012EAF0 = .text:0x8012EAF0; // type:function size:0x4
-fn_8012EB00 = .text:0x8012EB00; // type:function size:0x18
-fn_8012EB20 = .text:0x8012EB20; // type:function size:0x4
+finalizeState_Wait__16dLytMapPinIcon_cFv = .text:0x8012E8D0; // type:function size:0x4
+initializeState_ToSelect__16dLytMapPinIcon_cFv = .text:0x8012E8E0; // type:function size:0x48
+executeState_ToSelect__16dLytMapPinIcon_cFv = .text:0x8012E930; // type:function size:0x18
+finalizeState_ToSelect__16dLytMapPinIcon_cFv = .text:0x8012E950; // type:function size:0x10
+initializeState_Select__16dLytMapPinIcon_cFv = .text:0x8012E960; // type:function size:0x4
+executeState_Select__16dLytMapPinIcon_cFv = .text:0x8012E970; // type:function size:0x12C
+finalizeState_Select__16dLytMapPinIcon_cFv = .text:0x8012EAA0; // type:function size:0x4
+initializeState_ToUnselect__16dLytMapPinIcon_cFv = .text:0x8012EAB0; // type:function size:0x4
+executeState_ToUnselect__16dLytMapPinIcon_cFv = .text:0x8012EAC0; // type:function size:0x18
+finalizeState_ToUnselect__16dLytMapPinIcon_cFv = .text:0x8012EAE0; // type:function size:0x10
+initializeState_Remove__16dLytMapPinIcon_cFv = .text:0x8012EAF0; // type:function size:0x4
+executeState_Remove__16dLytMapPinIcon_cFv = .text:0x8012EB00; // type:function size:0x18
+finalizeState_Remove__16dLytMapPinIcon_cFv = .text:0x8012EB20; // type:function size:0x4
 fn_8012EB30 = .text:0x8012EB30; // type:function size:0xF8
 fn_8012EC30 = .text:0x8012EC30; // type:function size:0x80
 fn_8012ECB0 = .text:0x8012ECB0; // type:function size:0x10C
@@ -7553,17 +7553,17 @@ fn_8012F320 = .text:0x8012F320; // type:function size:0x60
 fn_8012F380 = .text:0x8012F380; // type:function size:0xE4
 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
+initializeState_Wait__25dLytMapPinIconAggregate_cFv = .text:0x8012F4C0; // type:function size:0x4
+executeState_Wait__25dLytMapPinIconAggregate_cFv = .text:0x8012F4D0; // type:function size:0xD8
 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
-fn_8012F760 = .text:0x8012F760; // type:function size:0x4
-fn_8012F770 = .text:0x8012F770; // type:function size:0x4
-fn_8012F780 = .text:0x8012F780; // type:function size:0x24
-fn_8012F7B0 = .text:0x8012F7B0; // type:function size:0x4
+finalizeState_Wait__25dLytMapPinIconAggregate_cFv = .text:0x8012F5D0; // type:function size:0x4
+initializeState_Select__25dLytMapPinIconAggregate_cFv = .text:0x8012F5E0; // type:function size:0x4
+executeState_Select__25dLytMapPinIconAggregate_cFv = .text:0x8012F5F0; // type:function size:0x168
+finalizeState_Select__25dLytMapPinIconAggregate_cFv = .text:0x8012F760; // type:function size:0x4
+initializeState_Remove__25dLytMapPinIconAggregate_cFv = .text:0x8012F770; // type:function size:0x4
+executeState_Remove__25dLytMapPinIconAggregate_cFv = .text:0x8012F780; // type:function size:0x24
+finalizeState_Remove__25dLytMapPinIconAggregate_cFv = .text:0x8012F7B0; // type:function size:0x4
 fn_8012F7C0 = .text:0x8012F7C0; // type:function size:0x94
 fn_8012F860 = .text:0x8012F860; // type:function size:0x5C
 fn_8012F8C0 = .text:0x8012F8C0; // type:function size:0x4C
@@ -7582,33 +7582,33 @@ fn_8012FC60 = .text:0x8012FC60; // 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
-fn_8012FE00 = .text:0x8012FE00; // type:function size:0xA0
-fn_8012FEA0 = .text:0x8012FEA0; // type:function size:0x4
-fn_8012FEB0 = .text:0x8012FEB0; // type:function size:0x4
-fn_8012FEC0 = .text:0x8012FEC0; // type:function size:0x90
-fn_8012FF50 = .text:0x8012FF50; // type:function size:0x4
-fn_8012FF60 = .text:0x8012FF60; // type:function size:0x4
-fn_8012FF70 = .text:0x8012FF70; // type:function size:0x100
-fn_80130070 = .text:0x80130070; // type:function size:0x4
-fn_80130080 = .text:0x80130080; // type:function size:0x4
-fn_80130090 = .text:0x80130090; // type:function size:0x78
-fn_80130110 = .text:0x80130110; // type:function size:0x4
-fn_80130120 = .text:0x80130120; // type:function size:0x4
-fn_80130130 = .text:0x80130130; // type:function size:0x78
-fn_801301B0 = .text:0x801301B0; // type:function size:0x4
-fn_801301C0 = .text:0x801301C0; // type:function size:0x4
-fn_801301D0 = .text:0x801301D0; // type:function size:0x90
-fn_80130260 = .text:0x80130260; // type:function size:0x4
-fn_80130270 = .text:0x80130270; // type:function size:0x4
-fn_80130280 = .text:0x80130280; // type:function size:0x78
-fn_80130300 = .text:0x80130300; // type:function size:0x4
-fn_80130310 = .text:0x80130310; // type:function size:0x4
-fn_80130320 = .text:0x80130320; // type:function size:0x148
-fn_80130470 = .text:0x80130470; // type:function size:0x4
-fn_80130480 = .text:0x80130480; // type:function size:0x4
-fn_80130490 = .text:0x80130490; // type:function size:0x78
-fn_80130510 = .text:0x80130510; // type:function size:0x4
+initializeState_Wait__17dLytMapFloorBtn_cFv = .text:0x8012FDF0; // type:function size:0x4
+executeState_Wait__17dLytMapFloorBtn_cFv = .text:0x8012FE00; // type:function size:0xA0
+finalizeState_Wait__17dLytMapFloorBtn_cFv = .text:0x8012FEA0; // type:function size:0x4
+initializeState_ToSelect__17dLytMapFloorBtn_cFv = .text:0x8012FEB0; // type:function size:0x4
+executeState_ToSelect__17dLytMapFloorBtn_cFv = .text:0x8012FEC0; // type:function size:0x90
+finalizeState_ToSelect__17dLytMapFloorBtn_cFv = .text:0x8012FF50; // type:function size:0x4
+initializeState_Select__17dLytMapFloorBtn_cFv = .text:0x8012FF60; // type:function size:0x4
+executeState_Select__17dLytMapFloorBtn_cFv = .text:0x8012FF70; // type:function size:0x100
+finalizeState_Select__17dLytMapFloorBtn_cFv = .text:0x80130070; // type:function size:0x4
+initializeState_ToWait__17dLytMapFloorBtn_cFv = .text:0x80130080; // type:function size:0x4
+executeState_ToWait__17dLytMapFloorBtn_cFv = .text:0x80130090; // type:function size:0x78
+finalizeState_ToWait__17dLytMapFloorBtn_cFv = .text:0x80130110; // type:function size:0x4
+initializeState_ToSelectInDecide__17dLytMapFloorBtn_cFv = .text:0x80130120; // type:function size:0x4
+executeState_ToSelectInDecide__17dLytMapFloorBtn_cFv = .text:0x80130130; // type:function size:0x78
+finalizeState_ToSelectInDecide__17dLytMapFloorBtn_cFv = .text:0x801301B0; // type:function size:0x4
+initializeState_SelectInDecide__17dLytMapFloorBtn_cFv = .text:0x801301C0; // type:function size:0x4
+executeState_SelectInDecide__17dLytMapFloorBtn_cFv = .text:0x801301D0; // type:function size:0x90
+finalizeState_SelectInDecide__17dLytMapFloorBtn_cFv = .text:0x80130260; // type:function size:0x4
+initializeState_ToDecide__17dLytMapFloorBtn_cFv = .text:0x80130270; // type:function size:0x4
+executeState_ToDecide__17dLytMapFloorBtn_cFv = .text:0x80130280; // type:function size:0x78
+finalizeState_ToDecide__17dLytMapFloorBtn_cFv = .text:0x80130300; // type:function size:0x4
+initializeState_Decide__17dLytMapFloorBtn_cFv = .text:0x80130310; // type:function size:0x4
+executeState_Decide__17dLytMapFloorBtn_cFv = .text:0x80130320; // type:function size:0x148
+finalizeState_Decide__17dLytMapFloorBtn_cFv = .text:0x80130470; // type:function size:0x4
+initializeState_DecideToSelectInDecide__17dLytMapFloorBtn_cFv = .text:0x80130480; // type:function size:0x4
+executeState_DecideToSelectInDecide__17dLytMapFloorBtn_cFv = .text:0x80130490; // type:function size:0x78
+finalizeState_DecideToSelectInDecide__17dLytMapFloorBtn_cFv = .text:0x80130510; // type:function size:0x4
 __dt__20dLytMapFloorBtnMgr_cFv = .text:0x80130520; // type:function size:0x17C
 __dt__17dLytMapFloorBtn_cFv = .text:0x801306A0; // type:function size:0xA8
 __dt__56sFStateMgr_c<17dLytMapFloorBtn_c,20sStateMethodUsr_FI_c>Fv = .text:0x80130750; // type:function size:0xA4
@@ -7635,52 +7635,52 @@ fn_80131590 = .text:0x80131590; // type:function size:0x1D8
 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
-fn_80131A60 = .text:0x80131A60; // type:function size:0x4
-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
+initializeState_Invisible__20dLytMapFloorBtnMgr_cFv = .text:0x80131A50; // type:function size:0x4
+executeState_Invisible__20dLytMapFloorBtnMgr_cFv = .text:0x80131A60; // type:function size:0x4
+finalizeState_Invisible__20dLytMapFloorBtnMgr_cFv = .text:0x80131A70; // type:function size:0x4
+initializeState_Wait__20dLytMapFloorBtnMgr_cFv = .text:0x80131A80; // type:function size:0x4
+executeState_Wait__20dLytMapFloorBtnMgr_cFv = .text:0x80131A90; // type:function size:0x4
+finalizeState_Wait__20dLytMapFloorBtnMgr_cFv = .text:0x80131AA0; // type:function size:0x4
 __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
 __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
+initializeState_Invisible__18dLytMapPopupInfo_cFv = .text:0x80131C30; // type:function size:0x4
+executeState_Invisible__18dLytMapPopupInfo_cFv = .text:0x80131C40; // type:function size:0x4
+finalizeState_Invisible__18dLytMapPopupInfo_cFv = .text:0x80131C50; // type:function size:0x4
+initializeState_In__18dLytMapPopupInfo_cFv = .text:0x80131C60; // type:function size:0xC
+executeState_In__18dLytMapPopupInfo_cFv = .text:0x80131C70; // type:function size:0x88
 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
-fn_80131DF0 = .text:0x80131DF0; // type:function size:0x4
-fn_80131E00 = .text:0x80131E00; // type:function size:0x4
-fn_80131E10 = .text:0x80131E10; // type:function size:0xB8
-fn_80131ED0 = .text:0x80131ED0; // type:function size:0x4
-fn_80131EE0 = .text:0x80131EE0; // type:function size:0xC
-fn_80131EF0 = .text:0x80131EF0; // type:function size:0x6C
-fn_80131F60 = .text:0x80131F60; // type:function size:0x4
+finalizeState_In__18dLytMapPopupInfo_cFv = .text:0x80131D10; // type:function size:0x4
+initializeState_Wait__18dLytMapPopupInfo_cFv = .text:0x80131D20; // type:function size:0x4
+executeState_Wait__18dLytMapPopupInfo_cFv = .text:0x80131D30; // type:function size:0xB8
+finalizeState_Wait__18dLytMapPopupInfo_cFv = .text:0x80131DF0; // type:function size:0x4
+initializeState_WaitInvalid__18dLytMapPopupInfo_cFv = .text:0x80131E00; // type:function size:0x4
+executeState_WaitInvalid__18dLytMapPopupInfo_cFv = .text:0x80131E10; // type:function size:0xB8
+finalizeState_WaitInvalid__18dLytMapPopupInfo_cFv = .text:0x80131ED0; // type:function size:0x4
+initializeState_Out__18dLytMapPopupInfo_cFv = .text:0x80131EE0; // type:function size:0xC
+executeState_Out__18dLytMapPopupInfo_cFv = .text:0x80131EF0; // type:function size:0x6C
+finalizeState_Out__18dLytMapPopupInfo_cFv = .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
 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
+initializeState_Invisible__24dLytMapSavePopupAction_cFv = .text:0x80132140; // type:function size:0x4
+executeState_Invisible__24dLytMapSavePopupAction_cFv = .text:0x80132150; // type:function size:0x28
 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
-fn_801322F0 = .text:0x801322F0; // type:function size:0x4
-fn_80132300 = .text:0x80132300; // type:function size:0x4
-fn_80132310 = .text:0x80132310; // type:function size:0x28
-fn_80132340 = .text:0x80132340; // type:function size:0x4
-fn_80132350 = .text:0x80132350; // type:function size:0x7C
-fn_801323D0 = .text:0x801323D0; // type:function size:0xB4
-fn_80132490 = .text:0x80132490; // type:function size:0x4
+finalizeState_Invisible__24dLytMapSavePopupAction_cFv = .text:0x80132190; // type:function size:0x4
+initializeState_In__24dLytMapSavePopupAction_cFv = .text:0x801321A0; // type:function size:0x7C
+executeState_In__24dLytMapSavePopupAction_cFv = .text:0x80132220; // type:function size:0xC4
+finalizeState_In__24dLytMapSavePopupAction_cFv = .text:0x801322F0; // type:function size:0x4
+initializeState_Wait__24dLytMapSavePopupAction_cFv = .text:0x80132300; // type:function size:0x4
+executeState_Wait__24dLytMapSavePopupAction_cFv = .text:0x80132310; // type:function size:0x28
+finalizeState_Wait__24dLytMapSavePopupAction_cFv = .text:0x80132340; // type:function size:0x4
+initializeState_Out__24dLytMapSavePopupAction_cFv = .text:0x80132350; // type:function size:0x7C
+executeState_Out__24dLytMapSavePopupAction_cFv = .text:0x801323D0; // type:function size:0xB4
+finalizeState_Out__24dLytMapSavePopupAction_cFv = .text:0x80132490; // type:function size:0x4
 fn_801324A0 = .text:0x801324A0; // 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
@@ -7693,19 +7693,19 @@ getStateID__93sStateMgr_c<24dLytMapSavePopupAction_c,20sStateMethodUsr_FI_c,12sF
 fn_80132A40 = .text:0x80132A40; // type:function size:0xC
 fn_80132A50 = .text:0x80132A50; // type:function size:0xA4
 fn_80132B00 = .text:0x80132B00; // type:function size:0x10
-fn_80132B10 = .text:0x80132B10; // type:function size:0x4
-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
+initializeState_Invisible__20dLytMapSaveCaption_cFv = .text:0x80132B10; // type:function size:0x4
+executeState_Invisible__20dLytMapSaveCaption_cFv = .text:0x80132B20; // type:function size:0x4
+finalizeState_Invisible__20dLytMapSaveCaption_cFv = .text:0x80132B30; // type:function size:0x4
+initializeState_In__20dLytMapSaveCaption_cFv = .text:0x80132B40; // type:function size:0x9C
+executeState_In__20dLytMapSaveCaption_cFv = .text:0x80132BE0; // type:function size:0x94
 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
-fn_80132CC0 = .text:0x80132CC0; // type:function size:0x4
-fn_80132CD0 = .text:0x80132CD0; // type:function size:0x48
-fn_80132D20 = .text:0x80132D20; // type:function size:0x90
-fn_80132DB0 = .text:0x80132DB0; // type:function size:0x4
+finalizeState_In__20dLytMapSaveCaption_cFv = .text:0x80132C90; // type:function size:0x4
+initializeState_Wait__20dLytMapSaveCaption_cFv = .text:0x80132CA0; // type:function size:0x4
+executeState_Wait__20dLytMapSaveCaption_cFv = .text:0x80132CB0; // type:function size:0x4
+finalizeState_Wait__20dLytMapSaveCaption_cFv = .text:0x80132CC0; // type:function size:0x4
+initializeState_Out__20dLytMapSaveCaption_cFv = .text:0x80132CD0; // type:function size:0x48
+executeState_Out__20dLytMapSaveCaption_cFv = .text:0x80132D20; // type:function size:0x90
+finalizeState_Out__20dLytMapSaveCaption_cFv = .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
@@ -7714,22 +7714,22 @@ fn_80132F70 = .text:0x80132F70; // type:function size:0x6C
 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
+initializeState_Wait__16dLytMapSaveObj_cFv = .text:0x80133230; // type:function size:0x4
+executeState_Wait__16dLytMapSaveObj_cFv = .text:0x80133240; // type:function size:0x78
 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
-fn_801333B0 = .text:0x801333B0; // type:function size:0x4
-fn_801333C0 = .text:0x801333C0; // type:function size:0x4
-fn_801333D0 = .text:0x801333D0; // type:function size:0xE4
-fn_801334C0 = .text:0x801334C0; // type:function size:0x4
-fn_801334D0 = .text:0x801334D0; // type:function size:0x4
-fn_801334E0 = .text:0x801334E0; // type:function size:0x8C
-fn_80133570 = .text:0x80133570; // type:function size:0x4
-fn_80133580 = .text:0x80133580; // type:function size:0x4
-fn_80133590 = .text:0x80133590; // type:function size:0x90
-fn_80133620 = .text:0x80133620; // type:function size:0x4
+finalizeState_Wait__16dLytMapSaveObj_cFv = .text:0x801332D0; // type:function size:0x4
+initializeState_ToSelect__16dLytMapSaveObj_cFv = .text:0x801332E0; // type:function size:0x4
+executeState_ToSelect__16dLytMapSaveObj_cFv = .text:0x801332F0; // type:function size:0xC0
+finalizeState_ToSelect__16dLytMapSaveObj_cFv = .text:0x801333B0; // type:function size:0x4
+initializeState_Select__16dLytMapSaveObj_cFv = .text:0x801333C0; // type:function size:0x4
+executeState_Select__16dLytMapSaveObj_cFv = .text:0x801333D0; // type:function size:0xE4
+finalizeState_Select__16dLytMapSaveObj_cFv = .text:0x801334C0; // type:function size:0x4
+initializeState_ToWait__16dLytMapSaveObj_cFv = .text:0x801334D0; // type:function size:0x4
+executeState_ToWait__16dLytMapSaveObj_cFv = .text:0x801334E0; // type:function size:0x8C
+finalizeState_ToWait__16dLytMapSaveObj_cFv = .text:0x80133570; // type:function size:0x4
+initializeState_Decide__16dLytMapSaveObj_cFv = .text:0x80133580; // type:function size:0x4
+executeState_Decide__16dLytMapSaveObj_cFv = .text:0x80133590; // type:function size:0x90
+finalizeState_Decide__16dLytMapSaveObj_cFv = .text:0x80133620; // type:function size:0x4
 fn_80133630 = .text:0x80133630; // type:function size:0x20
 fn_80133650 = .text:0x80133650; // type:function size:0xC
 fn_80133660 = .text:0x80133660; // type:function size:0xB0
@@ -7850,148 +7850,148 @@ fn_8013AC10 = .text:0x8013AC10; // type:function size:0x138
 fn_8013AD50 = .text:0x8013AD50; // type:function size:0x370
 fn_8013B0C0 = .text:0x8013B0C0; // type:function size:0x28C
 fn_8013B350 = .text:0x8013B350; // type:function size:0x10
-fn_8013B360 = .text:0x8013B360; // type:function size:0x4
-fn_8013B370 = .text:0x8013B370; // type:function size:0x4
-fn_8013B380 = .text:0x8013B380; // type:function size:0x4
-fn_8013B390 = .text:0x8013B390; // type:function size:0xC0
-fn_8013B450 = .text:0x8013B450; // type:function size:0x64
-fn_8013B4C0 = .text:0x8013B4C0; // type:function size:0x4
+initializeState_Invisible__13dLytMapMain_cFv = .text:0x8013B360; // type:function size:0x4
+executeState_Invisible__13dLytMapMain_cFv = .text:0x8013B370; // type:function size:0x4
+finalizeState_Invisible__13dLytMapMain_cFv = .text:0x8013B380; // type:function size:0x4
+initializeState_RenderingWait__13dLytMapMain_cFv = .text:0x8013B390; // type:function size:0xC0
+executeState_RenderingWait__13dLytMapMain_cFv = .text:0x8013B450; // type:function size:0x64
+finalizeState_RenderingWait__13dLytMapMain_cFv = .text:0x8013B4C0; // type:function size:0x4
 fn_8013B4D0 = .text:0x8013B4D0; // type:function size:0xD20
-fn_8013C1F0 = .text:0x8013C1F0; // type:function size:0xF4
-fn_8013C2F0 = .text:0x8013C2F0; // type:function size:0x380
-fn_8013C670 = .text:0x8013C670; // type:function size:0x40
+initializeState_In__13dLytMapMain_cFv = .text:0x8013C1F0; // type:function size:0xF4
+executeState_In__13dLytMapMain_cFv = .text:0x8013C2F0; // type:function size:0x380
+finalizeState_In__13dLytMapMain_cFv = .text:0x8013C670; // type:function size:0x40
 fn_8013C6B0 = .text:0x8013C6B0; // type:function size:0xA8
 fn_8013C760 = .text:0x8013C760; // type:function size:0x100
 fn_8013C860 = .text:0x8013C860; // type:function size:0x1C
 fn_8013C880 = .text:0x8013C880; // type:function size:0x64
 fn_8013C8F0 = .text:0x8013C8F0; // type:function size:0x644
 fn_8013CF40 = .text:0x8013CF40; // type:function size:0x54C
-fn_8013D490 = .text:0x8013D490; // type:function size:0x4
-fn_8013D4A0 = .text:0x8013D4A0; // type:function size:0x65C
-fn_8013DB00 = .text:0x8013DB00; // type:function size:0x10
-fn_8013DB10 = .text:0x8013DB10; // type:function size:0x110
-fn_8013DC20 = .text:0x8013DC20; // type:function size:0x120
-fn_8013DD40 = .text:0x8013DD40; // type:function size:0x4
-fn_8013DD50 = .text:0x8013DD50; // type:function size:0xC
-fn_8013DD60 = .text:0x8013DD60; // type:function size:0x58
-fn_8013DDC0 = .text:0x8013DDC0; // type:function size:0x4
-fn_8013DDD0 = .text:0x8013DDD0; // type:function size:0x17C
-fn_8013DF50 = .text:0x8013DF50; // type:function size:0x208
-fn_8013E160 = .text:0x8013E160; // type:function size:0x4
-fn_8013E170 = .text:0x8013E170; // type:function size:0x418
-fn_8013E590 = .text:0x8013E590; // type:function size:0x660
-fn_8013EBF0 = .text:0x8013EBF0; // type:function size:0x4
-fn_8013EC00 = .text:0x8013EC00; // type:function size:0x180
-fn_8013ED80 = .text:0x8013ED80; // type:function size:0x514
-fn_8013F2A0 = .text:0x8013F2A0; // type:function size:0x4
-fn_8013F2B0 = .text:0x8013F2B0; // type:function size:0x594
-fn_8013F850 = .text:0x8013F850; // type:function size:0x2CC
-fn_8013FB20 = .text:0x8013FB20; // type:function size:0x50
+initializeState_Active__13dLytMapMain_cFv = .text:0x8013D490; // type:function size:0x4
+executeState_Active__13dLytMapMain_cFv = .text:0x8013D4A0; // type:function size:0x65C
+finalizeState_Active__13dLytMapMain_cFv = .text:0x8013DB00; // type:function size:0x10
+initializeState_Out__13dLytMapMain_cFv = .text:0x8013DB10; // type:function size:0x110
+executeState_Out__13dLytMapMain_cFv = .text:0x8013DC20; // type:function size:0x120
+finalizeState_Out__13dLytMapMain_cFv = .text:0x8013DD40; // type:function size:0x4
+initializeState_FloorChange__13dLytMapMain_cFv = .text:0x8013DD50; // type:function size:0xC
+executeState_FloorChange__13dLytMapMain_cFv = .text:0x8013DD60; // type:function size:0x58
+finalizeState_FloorChange__13dLytMapMain_cFv = .text:0x8013DDC0; // type:function size:0x4
+initializeState_ChgMapUpDirection__13dLytMapMain_cFv = .text:0x8013DDD0; // type:function size:0x17C
+executeState_ChgMapUpDirection__13dLytMapMain_cFv = .text:0x8013DF50; // type:function size:0x208
+finalizeState_ChgMapUpDirection__13dLytMapMain_cFv = .text:0x8013E160; // type:function size:0x4
+initializeState_ChgDispAreaMode_MapRot__13dLytMapMain_cFv = .text:0x8013E170; // type:function size:0x418
+executeState_ChgDispAreaMode_MapRot__13dLytMapMain_cFv = .text:0x8013E590; // type:function size:0x660
+finalizeState_ChgDispAreaMode_MapRot__13dLytMapMain_cFv = .text:0x8013EBF0; // type:function size:0x4
+initializeState_ChgDispAreaMode_Map__13dLytMapMain_cFv = .text:0x8013EC00; // type:function size:0x180
+executeState_ChgDispAreaMode_Map__13dLytMapMain_cFv = .text:0x8013ED80; // type:function size:0x514
+finalizeState_ChgDispAreaMode_Map__13dLytMapMain_cFv = .text:0x8013F2A0; // type:function size:0x4
+initializeState_ChgDispAreaMode_WA__13dLytMapMain_cFv = .text:0x8013F2B0; // type:function size:0x594
+executeState_ChgDispAreaMode_WA__13dLytMapMain_cFv = .text:0x8013F850; // type:function size:0x2CC
+finalizeState_ChgDispAreaMode_WA__13dLytMapMain_cFv = .text:0x8013FB20; // type:function size:0x50
 fn_8013FB70 = .text:0x8013FB70; // type:function size:0xC0
-fn_8013FC30 = .text:0x8013FC30; // type:function size:0x3C0
-fn_8013FFF0 = .text:0x8013FFF0; // type:function size:0x388
-fn_80140380 = .text:0x80140380; // type:function size:0x4
-fn_80140390 = .text:0x80140390; // type:function size:0x88
-fn_80140420 = .text:0x80140420; // type:function size:0x14C
-fn_80140570 = .text:0x80140570; // type:function size:0x4
-fn_80140580 = .text:0x80140580; // type:function size:0x34
-fn_801405C0 = .text:0x801405C0; // type:function size:0xF4
-fn_801406C0 = .text:0x801406C0; // type:function size:0x4
-fn_801406D0 = .text:0x801406D0; // type:function size:0x20
-fn_801406F0 = .text:0x801406F0; // type:function size:0x3C
+initializeState_ChgDispAreaMode_CsrRot__13dLytMapMain_cFv = .text:0x8013FC30; // type:function size:0x3C0
+executeState_ChgDispAreaMode_CsrRot__13dLytMapMain_cFv = .text:0x8013FFF0; // type:function size:0x388
+finalizeState_ChgDispAreaMode_CsrRot__13dLytMapMain_cFv = .text:0x80140380; // type:function size:0x4
+initializeState_ResetPos__13dLytMapMain_cFv = .text:0x80140390; // type:function size:0x88
+executeState_ResetPos__13dLytMapMain_cFv = .text:0x80140420; // type:function size:0x14C
+finalizeState_ResetPos__13dLytMapMain_cFv = .text:0x80140570; // type:function size:0x4
+initializeState_ResetPosWithFloorChange__13dLytMapMain_cFv = .text:0x80140580; // type:function size:0x34
+executeState_ResetPosWithFloorChange__13dLytMapMain_cFv = .text:0x801405C0; // type:function size:0xF4
+finalizeState_ResetPosWithFloorChange__13dLytMapMain_cFv = .text:0x801406C0; // type:function size:0x4
+initializeState_EventSwBankSmall_Step1__13dLytMapMain_cFv = .text:0x801406D0; // type:function size:0x20
+executeState_EventSwBankSmall_Step1__13dLytMapMain_cFv = .text:0x801406F0; // type:function size:0x3C
 fn_8014072C = .text:0x8014072C; // type:function size:0x4
-fn_80140730 = .text:0x80140730; // type:function size:0x4
-fn_80140740 = .text:0x80140740; // type:function size:0x38
-fn_80140780 = .text:0x80140780; // type:function size:0x34
+finalizeState_EventSwBankSmall_Step1__13dLytMapMain_cFv = .text:0x80140730; // type:function size:0x4
+initializeState_EventSwBankSmall_Step2__13dLytMapMain_cFv = .text:0x80140740; // type:function size:0x38
+executeState_EventSwBankSmall_Step2__13dLytMapMain_cFv = .text:0x80140780; // type:function size:0x34
 fn_801407B4 = .text:0x801407B4; // type:function size:0x4
-fn_801407C0 = .text:0x801407C0; // type:function size:0x4
-fn_801407D0 = .text:0x801407D0; // type:function size:0x18
-fn_801407F0 = .text:0x801407F0; // type:function size:0x28
-fn_80140820 = .text:0x80140820; // type:function size:0x4
-fn_80140830 = .text:0x80140830; // type:function size:0x18
-fn_80140850 = .text:0x80140850; // type:function size:0x68
-fn_801408C0 = .text:0x801408C0; // type:function size:0x4
-fn_801408D0 = .text:0x801408D0; // type:function size:0x9C
-fn_80140970 = .text:0x80140970; // type:function size:0xE0
-fn_80140A50 = .text:0x80140A50; // type:function size:0x4
-fn_80140A60 = .text:0x80140A60; // type:function size:0x10
-fn_80140A70 = .text:0x80140A70; // type:function size:0xA0
-fn_80140B10 = .text:0x80140B10; // type:function size:0x4
-fn_80140B20 = .text:0x80140B20; // type:function size:0x18
-fn_80140B40 = .text:0x80140B40; // type:function size:0x38
-fn_80140B80 = .text:0x80140B80; // type:function size:0x4
+finalizeState_EventSwBankSmall_Step2__13dLytMapMain_cFv = .text:0x801407C0; // type:function size:0x4
+initializeState_EventSwBankSmall_Step3__13dLytMapMain_cFv = .text:0x801407D0; // type:function size:0x18
+executeState_EventSwBankSmall_Step3__13dLytMapMain_cFv = .text:0x801407F0; // type:function size:0x28
+finalizeState_EventSwBankSmall_Step3__13dLytMapMain_cFv = .text:0x80140820; // type:function size:0x4
+initializeState_EventMapIntro_Step1__13dLytMapMain_cFv = .text:0x80140830; // type:function size:0x18
+executeState_EventMapIntro_Step1__13dLytMapMain_cFv = .text:0x80140850; // type:function size:0x68
+finalizeState_EventMapIntro_Step1__13dLytMapMain_cFv = .text:0x801408C0; // type:function size:0x4
+initializeState_EventMapIntro_Step2__13dLytMapMain_cFv = .text:0x801408D0; // type:function size:0x9C
+executeState_EventMapIntro_Step2__13dLytMapMain_cFv = .text:0x80140970; // type:function size:0xE0
+finalizeState_EventMapIntro_Step2__13dLytMapMain_cFv = .text:0x80140A50; // type:function size:0x4
+initializeState_EventMapIntro_Step3__13dLytMapMain_cFv = .text:0x80140A60; // type:function size:0x10
+executeState_EventMapIntro_Step3__13dLytMapMain_cFv = .text:0x80140A70; // type:function size:0xA0
+finalizeState_EventMapIntro_Step3__13dLytMapMain_cFv = .text:0x80140B10; // type:function size:0x4
+initializeState_EventMapIntro_Step4__13dLytMapMain_cFv = .text:0x80140B20; // type:function size:0x18
+executeState_EventMapIntro_Step4__13dLytMapMain_cFv = .text:0x80140B40; // type:function size:0x38
+finalizeState_EventMapIntro_Step4__13dLytMapMain_cFv = .text:0x80140B80; // type:function size:0x4
 fn_80140B90 = .text:0x80140B90; // type:function size:0xBC
-fn_80140C50 = .text:0x80140C50; // type:function size:0x18
-fn_80140C70 = .text:0x80140C70; // type:function size:0x34
+initializeState_EventDungeonMapGet_Step1__13dLytMapMain_cFv = .text:0x80140C50; // type:function size:0x18
+executeState_EventDungeonMapGet_Step1__13dLytMapMain_cFv = .text:0x80140C70; // type:function size:0x34
 fn_80140CA4 = .text:0x80140CA4; // type:function size:0x4
-fn_80140CB0 = .text:0x80140CB0; // type:function size:0x4
-fn_80140CC0 = .text:0x80140CC0; // type:function size:0x68
-fn_80140D30 = .text:0x80140D30; // type:function size:0x12C
-fn_80140E60 = .text:0x80140E60; // type:function size:0x4
-fn_80140E70 = .text:0x80140E70; // type:function size:0x18
-fn_80140E90 = .text:0x80140E90; // type:function size:0x28
-fn_80140EC0 = .text:0x80140EC0; // type:function size:0x4
-fn_80140ED0 = .text:0x80140ED0; // type:function size:0x18
-fn_80140EF0 = .text:0x80140EF0; // type:function size:0x34
+finalizeState_EventDungeonMapGet_Step1__13dLytMapMain_cFv = .text:0x80140CB0; // type:function size:0x4
+initializeState_EventDungeonMapGet_Step2__13dLytMapMain_cFv = .text:0x80140CC0; // type:function size:0x68
+executeState_EventDungeonMapGet_Step2__13dLytMapMain_cFv = .text:0x80140D30; // type:function size:0x12C
+finalizeState_EventDungeonMapGet_Step2__13dLytMapMain_cFv = .text:0x80140E60; // type:function size:0x4
+initializeState_EventDungeonMapGet_Step3__13dLytMapMain_cFv = .text:0x80140E70; // type:function size:0x18
+executeState_EventDungeonMapGet_Step3__13dLytMapMain_cFv = .text:0x80140E90; // type:function size:0x28
+finalizeState_EventDungeonMapGet_Step3__13dLytMapMain_cFv = .text:0x80140EC0; // type:function size:0x4
+initializeState_EventFieldMapChange_Step1__13dLytMapMain_cFv = .text:0x80140ED0; // type:function size:0x18
+executeState_EventFieldMapChange_Step1__13dLytMapMain_cFv = .text:0x80140EF0; // type:function size:0x34
 fn_80140F24 = .text:0x80140F24; // type:function size:0x4
-fn_80140F30 = .text:0x80140F30; // type:function size:0x4
-fn_80140F40 = .text:0x80140F40; // type:function size:0x28
-fn_80140F70 = .text:0x80140F70; // type:function size:0xBC
-fn_80141030 = .text:0x80141030; // type:function size:0x4
-fn_80141040 = .text:0x80141040; // type:function size:0x18
-fn_80141060 = .text:0x80141060; // type:function size:0x58
+finalizeState_EventFieldMapChange_Step1__13dLytMapMain_cFv = .text:0x80140F30; // type:function size:0x4
+initializeState_EventFieldMapChange_Step2__13dLytMapMain_cFv = .text:0x80140F40; // type:function size:0x28
+executeState_EventFieldMapChange_Step2__13dLytMapMain_cFv = .text:0x80140F70; // type:function size:0xBC
+finalizeState_EventFieldMapChange_Step2__13dLytMapMain_cFv = .text:0x80141030; // type:function size:0x4
+initializeState_EventFieldMapChange_Step3__13dLytMapMain_cFv = .text:0x80141040; // type:function size:0x18
+executeState_EventFieldMapChange_Step3__13dLytMapMain_cFv = .text:0x80141060; // type:function size:0x58
 fn_801410B8 = .text:0x801410B8; // type:function size:0x4
-fn_801410C0 = .text:0x801410C0; // type:function size:0x4
-fn_801410D0 = .text:0x801410D0; // type:function size:0x4
-fn_801410E0 = .text:0x801410E0; // type:function size:0x4
-fn_801410F0 = .text:0x801410F0; // type:function size:0x4
-fn_80141100 = .text:0x80141100; // type:function size:0x18
-fn_80141120 = .text:0x80141120; // type:function size:0x34
+finalizeState_EventFieldMapChange_Step3__13dLytMapMain_cFv = .text:0x801410C0; // type:function size:0x4
+initializeState_EventFieldMapChange_Step4__13dLytMapMain_cFv = .text:0x801410D0; // type:function size:0x4
+executeState_EventFieldMapChange_Step4__13dLytMapMain_cFv = .text:0x801410E0; // type:function size:0x4
+finalizeState_EventFieldMapChange_Step4__13dLytMapMain_cFv = .text:0x801410F0; // type:function size:0x4
+initializeState_EventForestMapChange_Step1__13dLytMapMain_cFv = .text:0x80141100; // type:function size:0x18
+executeState_EventForestMapChange_Step1__13dLytMapMain_cFv = .text:0x80141120; // type:function size:0x34
 fn_80141154 = .text:0x80141154; // type:function size:0x4
-fn_80141160 = .text:0x80141160; // type:function size:0x4
-fn_80141170 = .text:0x80141170; // type:function size:0x6C
-fn_801411E0 = .text:0x801411E0; // type:function size:0x12C
-fn_80141310 = .text:0x80141310; // type:function size:0x4
-fn_80141320 = .text:0x80141320; // type:function size:0x18
-fn_80141340 = .text:0x80141340; // type:function size:0x28
-fn_80141370 = .text:0x80141370; // type:function size:0x4
-fn_80141380 = .text:0x80141380; // type:function size:0x4
-fn_80141390 = .text:0x80141390; // type:function size:0x58
-fn_801413F0 = .text:0x801413F0; // type:function size:0x4
-fn_80141400 = .text:0x80141400; // type:function size:0x18
-fn_80141420 = .text:0x80141420; // type:function size:0x90
-fn_801414B0 = .text:0x801414B0; // type:function size:0x4
-fn_801414C0 = .text:0x801414C0; // type:function size:0x18
-fn_801414E0 = .text:0x801414E0; // type:function size:0x34
+finalizeState_EventForestMapChange_Step1__13dLytMapMain_cFv = .text:0x80141160; // type:function size:0x4
+initializeState_EventForestMapChange_Step2__13dLytMapMain_cFv = .text:0x80141170; // type:function size:0x6C
+executeState_EventForestMapChange_Step2__13dLytMapMain_cFv = .text:0x801411E0; // type:function size:0x12C
+finalizeState_EventForestMapChange_Step2__13dLytMapMain_cFv = .text:0x80141310; // type:function size:0x4
+initializeState_EventForestMapChange_Step3__13dLytMapMain_cFv = .text:0x80141320; // type:function size:0x18
+executeState_EventForestMapChange_Step3__13dLytMapMain_cFv = .text:0x80141340; // type:function size:0x28
+finalizeState_EventForestMapChange_Step3__13dLytMapMain_cFv = .text:0x80141370; // type:function size:0x4
+initializeState_EventSignalAdd_Step1__13dLytMapMain_cFv = .text:0x80141380; // type:function size:0x4
+executeState_EventSignalAdd_Step1__13dLytMapMain_cFv = .text:0x80141390; // type:function size:0x58
+finalizeState_EventSignalAdd_Step1__13dLytMapMain_cFv = .text:0x801413F0; // type:function size:0x4
+initializeState_EventSignalAdd_Step2__13dLytMapMain_cFv = .text:0x80141400; // type:function size:0x18
+executeState_EventSignalAdd_Step2__13dLytMapMain_cFv = .text:0x80141420; // type:function size:0x90
+finalizeState_EventSignalAdd_Step2__13dLytMapMain_cFv = .text:0x801414B0; // type:function size:0x4
+initializeState_EventSignalAdd_Step3__13dLytMapMain_cFv = .text:0x801414C0; // type:function size:0x18
+executeState_EventSignalAdd_Step3__13dLytMapMain_cFv = .text:0x801414E0; // type:function size:0x34
 fn_80141514 = .text:0x80141514; // type:function size:0x4
-fn_80141520 = .text:0x80141520; // type:function size:0x4
+finalizeState_EventSignalAdd_Step3__13dLytMapMain_cFv = .text:0x80141520; // type:function size:0x4
 fn_80141530 = .text:0x80141530; // type:function size:0x48
 findGoddessChestWithStoryflag = .text:0x80141580; // type:function size:0x94
-fn_80141620 = .text:0x80141620; // type:function size:0x10
-fn_80141630 = .text:0x80141630; // type:function size:0x44
-fn_80141680 = .text:0x80141680; // type:function size:0x10
-fn_80141690 = .text:0x80141690; // type:function size:0x3E8
-fn_80141A80 = .text:0x80141A80; // type:function size:0x3B8
-fn_80141E40 = .text:0x80141E40; // type:function size:0x4
-fn_80141E50 = .text:0x80141E50; // type:function size:0x4
-fn_80141E60 = .text:0x80141E60; // type:function size:0x18
-fn_80141E80 = .text:0x80141E80; // type:function size:0x4
+initializeState_EventGoddessCube_Step1__13dLytMapMain_cFv = .text:0x80141620; // type:function size:0x10
+executeState_EventGoddessCube_Step1__13dLytMapMain_cFv = .text:0x80141630; // type:function size:0x44
+finalizeState_EventGoddessCube_Step1__13dLytMapMain_cFv = .text:0x80141680; // type:function size:0x10
+initializeState_EventGoddessCube_Step2__13dLytMapMain_cFv = .text:0x80141690; // type:function size:0x3E8
+executeState_EventGoddessCube_Step2__13dLytMapMain_cFv = .text:0x80141A80; // type:function size:0x3B8
+finalizeState_EventGoddessCube_Step2__13dLytMapMain_cFv = .text:0x80141E40; // type:function size:0x4
+initializeState_EventGoddessCube_Step3__13dLytMapMain_cFv = .text:0x80141E50; // type:function size:0x4
+executeState_EventGoddessCube_Step3__13dLytMapMain_cFv = .text:0x80141E60; // type:function size:0x18
+finalizeState_EventGoddessCube_Step3__13dLytMapMain_cFv = .text:0x80141E80; // type:function size:0x4
 checkStoryflag = .text:0x80141E90; // type:function size:0x44
-fn_80141EE0 = .text:0x80141EE0; // type:function size:0x90
-fn_80141F70 = .text:0x80141F70; // type:function size:0x54
-fn_80141FD0 = .text:0x80141FD0; // type:function size:0x4
+initializeState_EventSaveObjMsgWindow__13dLytMapMain_cFv = .text:0x80141EE0; // type:function size:0x90
+executeState_EventSaveObjMsgWindow__13dLytMapMain_cFv = .text:0x80141F70; // type:function size:0x54
+finalizeState_EventSaveObjMsgWindow__13dLytMapMain_cFv = .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
+initializeState_EventSaveObjSelect__13dLytMapMain_cFv = .text:0x801421C0; // type:function size:0x4
+executeState_EventSaveObjSelect__13dLytMapMain_cFv = .text:0x801421D0; // type:function size:0x278
 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
+finalizeState_EventSaveObjSelect__13dLytMapMain_cFv = .text:0x80142460; // type:function size:0x4
 getStatueSelectDestinationStruct = .text:0x80142470; // type:function size:0xEC
-fn_80142560 = .text:0x80142560; // type:function size:0x18
-fn_80142580 = .text:0x80142580; // type:function size:0x19C
-fn_80142720 = .text:0x80142720; // type:function size:0x4
-fn_80142730 = .text:0x80142730; // type:function size:0x4
-fn_80142740 = .text:0x80142740; // type:function size:0x4
-fn_80142750 = .text:0x80142750; // type:function size:0x4
+initializeState_EventSaveObjConfirmMsgWindow__13dLytMapMain_cFv = .text:0x80142560; // type:function size:0x18
+executeState_EventSaveObjConfirmMsgWindow__13dLytMapMain_cFv = .text:0x80142580; // type:function size:0x19C
+finalizeState_EventSaveObjConfirmMsgWindow__13dLytMapMain_cFv = .text:0x80142720; // type:function size:0x4
+initializeState_EventSaveObjDecide__13dLytMapMain_cFv = .text:0x80142730; // type:function size:0x4
+executeState_EventSaveObjDecide__13dLytMapMain_cFv = .text:0x80142740; // type:function size:0x4
+finalizeState_EventSaveObjDecide__13dLytMapMain_cFv = .text:0x80142750; // type:function size:0x4
 fn_80142760 = .text:0x80142760; // type:function size:0x190
 fn_801428F0 = .text:0x801428F0; // type:function size:0xB4
 fn_801429B0 = .text:0x801429B0; // type:function size:0x1D8
diff --git a/src/d/lyt/d_lyt_map.cpp b/src/d/lyt/d_lyt_map.cpp
index f0029750..855a3639 100644
--- a/src/d/lyt/d_lyt_map.cpp
+++ b/src/d/lyt/d_lyt_map.cpp
@@ -174,6 +174,154 @@ void dLytMapFader_c::draw() {
     mFader.draw();
 }
 
+void dLytMapPinIcon_c::initializeState_Wait() {}
+void dLytMapPinIcon_c::executeState_Wait() {}
+void dLytMapPinIcon_c::finalizeState_Wait() {}
+
+void dLytMapPinIcon_c::initializeState_ToSelect() {}
+void dLytMapPinIcon_c::executeState_ToSelect() {}
+void dLytMapPinIcon_c::finalizeState_ToSelect() {}
+
+void dLytMapPinIcon_c::initializeState_Select() {}
+void dLytMapPinIcon_c::executeState_Select() {}
+void dLytMapPinIcon_c::finalizeState_Select() {}
+
+void dLytMapPinIcon_c::initializeState_ToUnselect() {}
+void dLytMapPinIcon_c::executeState_ToUnselect() {}
+void dLytMapPinIcon_c::finalizeState_ToUnselect() {}
+
+void dLytMapPinIcon_c::initializeState_Remove() {}
+void dLytMapPinIcon_c::executeState_Remove() {}
+void dLytMapPinIcon_c::finalizeState_Remove() {}
+
+void dLytMapPinIconAggregate_c::initializeState_Wait() {}
+void dLytMapPinIconAggregate_c::executeState_Wait() {}
+void dLytMapPinIconAggregate_c::finalizeState_Wait() {}
+
+void dLytMapPinIconAggregate_c::initializeState_Select() {}
+void dLytMapPinIconAggregate_c::executeState_Select() {}
+void dLytMapPinIconAggregate_c::finalizeState_Select() {}
+
+void dLytMapPinIconAggregate_c::initializeState_Remove() {}
+void dLytMapPinIconAggregate_c::executeState_Remove() {}
+void dLytMapPinIconAggregate_c::finalizeState_Remove() {}
+
+void dLytMapFloorBtn_c::initializeState_Wait() {}
+void dLytMapFloorBtn_c::executeState_Wait() {}
+void dLytMapFloorBtn_c::finalizeState_Wait() {}
+
+void dLytMapFloorBtn_c::initializeState_ToSelect() {}
+void dLytMapFloorBtn_c::executeState_ToSelect() {}
+void dLytMapFloorBtn_c::finalizeState_ToSelect() {}
+
+void dLytMapFloorBtn_c::initializeState_Select() {}
+void dLytMapFloorBtn_c::executeState_Select() {}
+void dLytMapFloorBtn_c::finalizeState_Select() {}
+
+void dLytMapFloorBtn_c::initializeState_ToWait() {}
+void dLytMapFloorBtn_c::executeState_ToWait() {}
+void dLytMapFloorBtn_c::finalizeState_ToWait() {}
+
+void dLytMapFloorBtn_c::initializeState_ToSelectInDecide() {}
+void dLytMapFloorBtn_c::executeState_ToSelectInDecide() {}
+void dLytMapFloorBtn_c::finalizeState_ToSelectInDecide() {}
+
+void dLytMapFloorBtn_c::initializeState_SelectInDecide() {}
+void dLytMapFloorBtn_c::executeState_SelectInDecide() {}
+void dLytMapFloorBtn_c::finalizeState_SelectInDecide() {}
+
+void dLytMapFloorBtn_c::initializeState_ToDecide() {}
+void dLytMapFloorBtn_c::executeState_ToDecide() {}
+void dLytMapFloorBtn_c::finalizeState_ToDecide() {}
+
+void dLytMapFloorBtn_c::initializeState_Decide() {}
+void dLytMapFloorBtn_c::executeState_Decide() {}
+void dLytMapFloorBtn_c::finalizeState_Decide() {}
+
+void dLytMapFloorBtn_c::initializeState_DecideToSelectInDecide() {}
+void dLytMapFloorBtn_c::executeState_DecideToSelectInDecide() {}
+void dLytMapFloorBtn_c::finalizeState_DecideToSelectInDecide() {}
+
+void dLytMapFloorBtnMgr_c::initializeState_Invisible() {}
+void dLytMapFloorBtnMgr_c::executeState_Invisible() {}
+void dLytMapFloorBtnMgr_c::finalizeState_Invisible() {}
+
+void dLytMapFloorBtnMgr_c::initializeState_Wait() {}
+void dLytMapFloorBtnMgr_c::executeState_Wait() {}
+void dLytMapFloorBtnMgr_c::finalizeState_Wait() {}
+
+void dLytMapPopupInfo_c::initializeState_Invisible() {}
+void dLytMapPopupInfo_c::executeState_Invisible() {}
+void dLytMapPopupInfo_c::finalizeState_Invisible() {}
+
+void dLytMapPopupInfo_c::initializeState_In() {}
+void dLytMapPopupInfo_c::executeState_In() {}
+void dLytMapPopupInfo_c::finalizeState_In() {}
+
+void dLytMapPopupInfo_c::initializeState_Wait() {}
+void dLytMapPopupInfo_c::executeState_Wait() {}
+void dLytMapPopupInfo_c::finalizeState_Wait() {}
+
+void dLytMapPopupInfo_c::initializeState_WaitInvalid() {}
+void dLytMapPopupInfo_c::executeState_WaitInvalid() {}
+void dLytMapPopupInfo_c::finalizeState_WaitInvalid() {}
+
+void dLytMapPopupInfo_c::initializeState_Out() {}
+void dLytMapPopupInfo_c::executeState_Out() {}
+void dLytMapPopupInfo_c::finalizeState_Out() {}
+
+void dLytMapSavePopupAction_c::initializeState_Invisible() {}
+void dLytMapSavePopupAction_c::executeState_Invisible() {}
+void dLytMapSavePopupAction_c::finalizeState_Invisible() {}
+
+void dLytMapSavePopupAction_c::initializeState_In() {}
+void dLytMapSavePopupAction_c::executeState_In() {}
+void dLytMapSavePopupAction_c::finalizeState_In() {}
+
+void dLytMapSavePopupAction_c::initializeState_Wait() {}
+void dLytMapSavePopupAction_c::executeState_Wait() {}
+void dLytMapSavePopupAction_c::finalizeState_Wait() {}
+
+void dLytMapSavePopupAction_c::initializeState_Out() {}
+void dLytMapSavePopupAction_c::executeState_Out() {}
+void dLytMapSavePopupAction_c::finalizeState_Out() {}
+
+void dLytMapSaveCaption_c::initializeState_Invisible() {}
+void dLytMapSaveCaption_c::executeState_Invisible() {}
+void dLytMapSaveCaption_c::finalizeState_Invisible() {}
+
+void dLytMapSaveCaption_c::initializeState_In() {}
+void dLytMapSaveCaption_c::executeState_In() {}
+void dLytMapSaveCaption_c::finalizeState_In() {}
+
+void dLytMapSaveCaption_c::initializeState_Wait() {}
+void dLytMapSaveCaption_c::executeState_Wait() {}
+void dLytMapSaveCaption_c::finalizeState_Wait() {}
+
+void dLytMapSaveCaption_c::initializeState_Out() {}
+void dLytMapSaveCaption_c::executeState_Out() {}
+void dLytMapSaveCaption_c::finalizeState_Out() {}
+
+void dLytMapSaveObj_c::initializeState_Wait() {}
+void dLytMapSaveObj_c::executeState_Wait() {}
+void dLytMapSaveObj_c::finalizeState_Wait() {}
+
+void dLytMapSaveObj_c::initializeState_ToSelect() {}
+void dLytMapSaveObj_c::executeState_ToSelect() {}
+void dLytMapSaveObj_c::finalizeState_ToSelect() {}
+
+void dLytMapSaveObj_c::initializeState_Select() {}
+void dLytMapSaveObj_c::executeState_Select() {}
+void dLytMapSaveObj_c::finalizeState_Select() {}
+
+void dLytMapSaveObj_c::initializeState_ToWait() {}
+void dLytMapSaveObj_c::executeState_ToWait() {}
+void dLytMapSaveObj_c::finalizeState_ToWait() {}
+
+void dLytMapSaveObj_c::initializeState_Decide() {}
+void dLytMapSaveObj_c::executeState_Decide() {}
+void dLytMapSaveObj_c::finalizeState_Decide() {}
+
 #pragma dont_inline on
 dLytMapMain_c::dLytMapMain_c() : mStateMgr(*this), mFloorBtnMgr(&field_0x8DC8) {}
 #pragma dont_inline reset
@@ -197,3 +345,163 @@ void lytMapusesSizedWString() {
     static SizedWString<0x20> sString;
     sString.sprintf(L"%ld", 0);
 }
+
+void dLytMapMain_c::initializeState_Invisible() {}
+void dLytMapMain_c::executeState_Invisible() {}
+void dLytMapMain_c::finalizeState_Invisible() {}
+
+void dLytMapMain_c::initializeState_RenderingWait() {}
+void dLytMapMain_c::executeState_RenderingWait() {}
+void dLytMapMain_c::finalizeState_RenderingWait() {}
+
+void dLytMapMain_c::initializeState_In() {}
+void dLytMapMain_c::executeState_In() {}
+void dLytMapMain_c::finalizeState_In() {}
+
+void dLytMapMain_c::initializeState_Active() {}
+void dLytMapMain_c::executeState_Active() {}
+void dLytMapMain_c::finalizeState_Active() {}
+
+void dLytMapMain_c::initializeState_Out() {}
+void dLytMapMain_c::executeState_Out() {}
+void dLytMapMain_c::finalizeState_Out() {}
+
+void dLytMapMain_c::initializeState_FloorChange() {}
+void dLytMapMain_c::executeState_FloorChange() {}
+void dLytMapMain_c::finalizeState_FloorChange() {}
+
+void dLytMapMain_c::initializeState_ChgMapUpDirection() {}
+void dLytMapMain_c::executeState_ChgMapUpDirection() {}
+void dLytMapMain_c::finalizeState_ChgMapUpDirection() {}
+
+void dLytMapMain_c::initializeState_ChgDispAreaMode_MapRot() {}
+void dLytMapMain_c::executeState_ChgDispAreaMode_MapRot() {}
+void dLytMapMain_c::finalizeState_ChgDispAreaMode_MapRot() {}
+
+void dLytMapMain_c::initializeState_ChgDispAreaMode_Map() {}
+void dLytMapMain_c::executeState_ChgDispAreaMode_Map() {}
+void dLytMapMain_c::finalizeState_ChgDispAreaMode_Map() {}
+
+void dLytMapMain_c::initializeState_ChgDispAreaMode_WA() {}
+void dLytMapMain_c::executeState_ChgDispAreaMode_WA() {}
+void dLytMapMain_c::finalizeState_ChgDispAreaMode_WA() {}
+
+void dLytMapMain_c::initializeState_ChgDispAreaMode_CsrRot() {}
+void dLytMapMain_c::executeState_ChgDispAreaMode_CsrRot() {}
+void dLytMapMain_c::finalizeState_ChgDispAreaMode_CsrRot() {}
+
+void dLytMapMain_c::initializeState_ResetPos() {}
+void dLytMapMain_c::executeState_ResetPos() {}
+void dLytMapMain_c::finalizeState_ResetPos() {}
+
+void dLytMapMain_c::initializeState_ResetPosWithFloorChange() {}
+void dLytMapMain_c::executeState_ResetPosWithFloorChange() {}
+void dLytMapMain_c::finalizeState_ResetPosWithFloorChange() {}
+
+void dLytMapMain_c::initializeState_EventSwBankSmall_Step1() {}
+void dLytMapMain_c::executeState_EventSwBankSmall_Step1() {}
+void dLytMapMain_c::finalizeState_EventSwBankSmall_Step1() {}
+
+void dLytMapMain_c::initializeState_EventSwBankSmall_Step2() {}
+void dLytMapMain_c::executeState_EventSwBankSmall_Step2() {}
+void dLytMapMain_c::finalizeState_EventSwBankSmall_Step2() {}
+
+void dLytMapMain_c::initializeState_EventSwBankSmall_Step3() {}
+void dLytMapMain_c::executeState_EventSwBankSmall_Step3() {}
+void dLytMapMain_c::finalizeState_EventSwBankSmall_Step3() {}
+
+void dLytMapMain_c::initializeState_EventMapIntro_Step1() {}
+void dLytMapMain_c::executeState_EventMapIntro_Step1() {}
+void dLytMapMain_c::finalizeState_EventMapIntro_Step1() {}
+
+void dLytMapMain_c::initializeState_EventMapIntro_Step2() {}
+void dLytMapMain_c::executeState_EventMapIntro_Step2() {}
+void dLytMapMain_c::finalizeState_EventMapIntro_Step2() {}
+
+void dLytMapMain_c::initializeState_EventMapIntro_Step3() {}
+void dLytMapMain_c::executeState_EventMapIntro_Step3() {}
+void dLytMapMain_c::finalizeState_EventMapIntro_Step3() {}
+
+void dLytMapMain_c::initializeState_EventMapIntro_Step4() {}
+void dLytMapMain_c::executeState_EventMapIntro_Step4() {}
+void dLytMapMain_c::finalizeState_EventMapIntro_Step4() {}
+
+void dLytMapMain_c::initializeState_EventDungeonMapGet_Step1() {}
+void dLytMapMain_c::executeState_EventDungeonMapGet_Step1() {}
+void dLytMapMain_c::finalizeState_EventDungeonMapGet_Step1() {}
+
+void dLytMapMain_c::initializeState_EventDungeonMapGet_Step2() {}
+void dLytMapMain_c::executeState_EventDungeonMapGet_Step2() {}
+void dLytMapMain_c::finalizeState_EventDungeonMapGet_Step2() {}
+
+void dLytMapMain_c::initializeState_EventDungeonMapGet_Step3() {}
+void dLytMapMain_c::executeState_EventDungeonMapGet_Step3() {}
+void dLytMapMain_c::finalizeState_EventDungeonMapGet_Step3() {}
+
+void dLytMapMain_c::initializeState_EventFieldMapChange_Step1() {}
+void dLytMapMain_c::executeState_EventFieldMapChange_Step1() {}
+void dLytMapMain_c::finalizeState_EventFieldMapChange_Step1() {}
+
+void dLytMapMain_c::initializeState_EventFieldMapChange_Step2() {}
+void dLytMapMain_c::executeState_EventFieldMapChange_Step2() {}
+void dLytMapMain_c::finalizeState_EventFieldMapChange_Step2() {}
+
+void dLytMapMain_c::initializeState_EventFieldMapChange_Step3() {}
+void dLytMapMain_c::executeState_EventFieldMapChange_Step3() {}
+void dLytMapMain_c::finalizeState_EventFieldMapChange_Step3() {}
+
+void dLytMapMain_c::initializeState_EventFieldMapChange_Step4() {}
+void dLytMapMain_c::executeState_EventFieldMapChange_Step4() {}
+void dLytMapMain_c::finalizeState_EventFieldMapChange_Step4() {}
+
+void dLytMapMain_c::initializeState_EventForestMapChange_Step1() {}
+void dLytMapMain_c::executeState_EventForestMapChange_Step1() {}
+void dLytMapMain_c::finalizeState_EventForestMapChange_Step1() {}
+
+void dLytMapMain_c::initializeState_EventForestMapChange_Step2() {}
+void dLytMapMain_c::executeState_EventForestMapChange_Step2() {}
+void dLytMapMain_c::finalizeState_EventForestMapChange_Step2() {}
+
+void dLytMapMain_c::initializeState_EventForestMapChange_Step3() {}
+void dLytMapMain_c::executeState_EventForestMapChange_Step3() {}
+void dLytMapMain_c::finalizeState_EventForestMapChange_Step3() {}
+
+void dLytMapMain_c::initializeState_EventSignalAdd_Step1() {}
+void dLytMapMain_c::executeState_EventSignalAdd_Step1() {}
+void dLytMapMain_c::finalizeState_EventSignalAdd_Step1() {}
+
+void dLytMapMain_c::initializeState_EventSignalAdd_Step2() {}
+void dLytMapMain_c::executeState_EventSignalAdd_Step2() {}
+void dLytMapMain_c::finalizeState_EventSignalAdd_Step2() {}
+
+void dLytMapMain_c::initializeState_EventSignalAdd_Step3() {}
+void dLytMapMain_c::executeState_EventSignalAdd_Step3() {}
+void dLytMapMain_c::finalizeState_EventSignalAdd_Step3() {}
+
+void dLytMapMain_c::initializeState_EventGoddessCube_Step1() {}
+void dLytMapMain_c::executeState_EventGoddessCube_Step1() {}
+void dLytMapMain_c::finalizeState_EventGoddessCube_Step1() {}
+
+void dLytMapMain_c::initializeState_EventGoddessCube_Step2() {}
+void dLytMapMain_c::executeState_EventGoddessCube_Step2() {}
+void dLytMapMain_c::finalizeState_EventGoddessCube_Step2() {}
+
+void dLytMapMain_c::initializeState_EventGoddessCube_Step3() {}
+void dLytMapMain_c::executeState_EventGoddessCube_Step3() {}
+void dLytMapMain_c::finalizeState_EventGoddessCube_Step3() {}
+
+void dLytMapMain_c::initializeState_EventSaveObjMsgWindow() {}
+void dLytMapMain_c::executeState_EventSaveObjMsgWindow() {}
+void dLytMapMain_c::finalizeState_EventSaveObjMsgWindow() {}
+
+void dLytMapMain_c::initializeState_EventSaveObjSelect() {}
+void dLytMapMain_c::executeState_EventSaveObjSelect() {}
+void dLytMapMain_c::finalizeState_EventSaveObjSelect() {}
+
+void dLytMapMain_c::initializeState_EventSaveObjConfirmMsgWindow() {}
+void dLytMapMain_c::executeState_EventSaveObjConfirmMsgWindow() {}
+void dLytMapMain_c::finalizeState_EventSaveObjConfirmMsgWindow() {}
+
+void dLytMapMain_c::initializeState_EventSaveObjDecide() {}
+void dLytMapMain_c::executeState_EventSaveObjDecide() {}
+void dLytMapMain_c::finalizeState_EventSaveObjDecide() {}