Merge branch 'main' of ssh://github.com/TwilitRealm/dusklight into rando-mod

include/d/d_file_select.h

@@ -9,6 +9,10 @@
 #include "JSystem/J3DGraphLoader/J3DModelLoader.h"
 #include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
 
+#if TARGET_PC
+#include "mods/svc/game_mode.h"
+#endif
+
 class dFile_info_c;
 class J2DPicture;
 
@@ -420,6 +424,13 @@ public:
     bool pointerMenuSelect();
     bool pointerCopyDataToSelect();
     bool pointerYesNoSelect(bool errorSelect);
+    void backToDataSelectMove() {
+        headerTxtSet(0x43, 1, 0);
+        fileRecScaleAnmInitSet2(0.0f, 1.0f);
+        nameMoveAnmInitSet(0xd29, 0xd1f);
+        modoruTxtDispAnmInit(0);
+        mDataSelProc = DATASELPROC_NAME_TO_DATA_SELECT_MOVE;
+    }
     #endif
     void _draw();
     void errorMoveAnmInitSet(int, int);
@@ -733,6 +744,8 @@ public:
     #endif
 #ifdef TARGET_PC
     dDlst_FileSelFade_c mFadeDlst;
+    bool mGameModeSaveStartBuildUi = true;
+    GameModeNewSaveState mGameModeNewSaveState = GAME_MODE_STATE_PENDING;
 #endif
 
     #if PLATFORM_WII || PLATFORM_SHIELD

include/m_Do/m_Do_MemCard.h

@@ -112,6 +112,11 @@ public:
         mSerialNo = serial_no;
     }
 
+#ifdef TARGET_PC
+    void setFileName(const std::string& fileName);
+    const char* getFileName();
+#endif
+
     /* 0x0000 */ u8 mData[SAVEFILE_SIZE];
     /* 0x1FBC */ u8 mChannel;
     /* 0x1FBD */ u8 mCopyToPos;
@@ -124,6 +129,11 @@ public:
     /* 0x1FEC */ s32 mNandState;
     /* 0x1FF0 */ u64 mSerialNo;
     /* 0x1FF8 */ u32 mDataVersion;
+#ifdef TARGET_PC
+    bool mInitialized;
+    std::string mFileName;
+#endif
+
 };  // Size: 0x2000
 
 STATIC_ASSERT(sizeof(mDoMemCd_Ctrl_c) == 8192);
@@ -230,4 +240,14 @@ inline s32 mDoMemCd_checkNANDFile() {
 }
 #endif
 
+#ifdef TARGET_PC
+inline void mDoMemCd_SetFileName(const std::string& fileName) {
+    g_mDoMemCd_control.setFileName(fileName);
+}
+
+inline const char* mDoMemCd_GetFileName() {
+    return g_mDoMemCd_control.getFileName();
+}
+#endif
+
 #endif /* M_DO_M_DO_MEMCARD_H */