d_lyt_save_mgr OK

include/d/flag/storyflag_manager.h

@@ -2,7 +2,7 @@
 #define D_FLAG_STORYFLAG_MANAGER_H
 
 #include "d/flag/baseflag_manager.h"
-#include "d/flag/storyflag_map.h"
+#include "d/flag/storyflag_map.h" // IWYU pragma: export
 #include "toBeSorted/file_manager.h"
 
 class StoryflagManager : public ItemStoryManagerBase {

include/d/flag/storyflag_map.h

@@ -197,7 +197,7 @@ enum StoryFlags_e {
      * Sealed Grounds layer 1 / Behind The Temple layer 1 / Goddess Statue layers 2&3)] Story Flag #36 (0x0024) - JP
      * 805ACD5D 0x10 / US 805A9ADD 0x10
      */
-    STORYFLAG_36,
+    STORYFLAG_HEROS_TUNIC_FI,
 
     /** [Horwell Z-target tutorial]
      *  Story Flag #37 (0x0025) - JP 805ACD65 0x08 / US 805A9AE5 0x08
@@ -1150,7 +1150,7 @@ enum StoryFlags_e {
     /** [Hero Mode]
      *  Story Flag #226 (0x00E2) - JP 805ACD72 0x08 / US 805A9AF2 0x08
      */
-    STORYFLAG_226,
+    STORYFLAG_HERO_MODE,
 
     /** [First Goddess Cube (Unlocks ability to skyward strike Goddess Cubes)]
      *  Story Flag #227 (0x00E3) - JP 805ACD72 0x20 / US 805A9AF2 0x20

include/d/lyt/d_lyt_save_mgr.h

@@ -1,17 +1,73 @@
 #ifndef D_LYT_SAVE_MGR_H
 #define D_LYT_SAVE_MGR_H
 
-class dLytSaveMgr_c {
-public:
+#include "d/d_base.h"
+#include "d/lyt/d_lyt_save_msg_window.h"
+#include "s/s_State.hpp"
 
-    static dLytSaveMgr_c* GetInstance() {
+class dLytSaveMgr_c : public dBase_c {
+public:
+    dLytSaveMgr_c();
+    virtual ~dLytSaveMgr_c();
+
+    virtual int create() override;
+    virtual int doDelete() override;
+    virtual int execute() override;
+    virtual int draw() override;
+
+    static dLytSaveMgr_c *GetInstance() {
         return sInstance;
     }
 
-    bool fn_80285650() const;
+    
+    void init();
+    
+    enum FadeInPrompt_e {
+        PROMPT_SAVEOBJ_NORMAL,
+        PROMPT_SAVEOBJ_TOSKY,
+        PROMPT_SAVEOBJ_DUNGEON,
+        PROMPT_SAVE_NORMAL,
+        PROMPT_HERO_MODE,
+        PROMPT_HERO_MODE_CONFIRM,
+
+        PROMPT_MAX,
+        
+        PROMPT_SAVEOBJ_NUM = PROMPT_SAVEOBJ_DUNGEON + 1,
+    };
+    
+    bool setPrompt(s32 prompt, bool setTempflag2);
+    bool setSaveobjPrompt(s32 prompt, u8 saveobjId, bool setTempflag2);
+    bool unused_weakfnorder();
+    bool isBusy() const;
+
+    enum Action_e {
+        ACTION_0,
+        ACTION_1,
+        ACTION_2,
+        ACTION_3,
+        ACTION_MAX,
+    };
 
 private:
     static dLytSaveMgr_c *sInstance;
+
+    STATE_FUNC_DECLARE(dLytSaveMgr_c, Init);
+    STATE_FUNC_DECLARE(dLytSaveMgr_c, FadeOut);
+    STATE_FUNC_DECLARE(dLytSaveMgr_c, Select);
+    STATE_FUNC_DECLARE(dLytSaveMgr_c, FadeIn);
+
+    /* 0x0068 */ UI_STATE_MGR_DECLARE(dLytSaveMgr_c);
+    /* 0x00A4 */ dLytSaveMsgWindow_c mWindow;
+    /* 0x1184 */ s32 mSavePrompt;
+    /* 0x1188 */ s32 mStep;
+    /* 0x118C */ s32 mChosenAction;
+
+    /* 0x1190 */ u8 _0x1190[0x119A - 0x1190];
+
+    /* 0x119A */ u8 mSaveobjId;
+    /* 0x119B */ bool mFadeOutRequested;
+    /* 0x119C */ bool mIsFinishedFadingIn;
+    /* 0x119D */ bool mShouldSetTempflag2;
 };
 
 #endif

include/d/lyt/d_lyt_save_msg_window.h

@@ -11,6 +11,13 @@ public:
     dLytSaveMsgWindow_c();
     virtual ~dLytSaveMsgWindow_c() {}
 
+    enum Mode_e {
+        MODE_NONE,
+        MODE_2_BUTTONS,
+        MODE_3_BUTTONS,
+        MODE_4_BUTTONS,
+    };
+
     bool build(bool);
     bool remove();
     bool execute();
@@ -28,6 +35,30 @@ public:
         return mWillFinishOut;
     }
 
+    void setField0x10B8(s32 val) {
+        field_0x10B8 = val;
+    }
+
+    void setField0x10BC(s32 val) {
+        field_0x10BC = val;
+    }
+
+    s32 getField0x10C4() const {
+        return field_0x10C4;
+    }
+
+    s32 getField0x10C8() const {
+        return field_0x10C8;
+    }
+
+    void setField0x10DC(u8 val) {
+        field_0x10DC = val;
+    }
+
+    void setSaveObjId(s32 id) {
+        mSaveobjId = id;
+    }
+
 private:
     void resetProperties();
     void setupSaveTextMaybe();

include/toBeSorted/save_manager.h

@@ -124,9 +124,15 @@ public:
         return sInstance;
     }
 
+    bool isIdle() const {
+        return mIsIdle;
+    }
     bool getField_0x83D() const {
         return field_0x83D;
     }
+    void setField_0x83D(bool v) {
+        field_0x83D = v;
+    }
     bool getField_0x83F() const {
         return field_0x83F;
     }
@@ -226,14 +232,14 @@ private:
     /* 0x830 */ s32 mDelayTimer;
     /* 0x834 */ u8 mCopyToFile;
     /* 0x835 */ u8 mCopyFromFile;
-    /* 0x836 */ u8 field_0x836;
+    /* 0x836 */ bool mIsIdle;
     /* 0x837 */ u8 field_0x837;
     /* 0x838 */ u8 field_0x838;
     /* 0x839 */ u8 field_0x839;
     /* 0x83A */ u8 field_0x83A;
     /* 0x83B */ u8 field_0x83B;
     /* 0x83C */ u8 field_0x83C;
-    /* 0x83D */ u8 field_0x83D;
+    /* 0x83D */ bool field_0x83D;
     /* 0x83E */ u8 field_0x83E;
     /* 0x83F */ u8 field_0x83F;