3 files changed, 24 insertions, 20 deletions

diff --git a/src/common/common_paths.h b/src/common/common_paths.h
index e692e5492..f019944f5 100644
--- a/src/common/common_paths.h
+++ b/src/common/common_paths.h
@@ -35,26 +35,27 @@
 #define JAP_DIR "JAP"
 
 // Subdirs in the User dir returned by GetUserPath(D_USER_IDX)
-#define CONFIG_DIR        "config"
-#define GAMECONFIG_DIR    "game_config"
-#define MAPS_DIR          "maps"
-#define CACHE_DIR         "cache"
-#define SDMC_DIR          "sdmc"
-#define EXTSAVEDATA_DIR   "extsavedata"
-#define SAVEDATA_DIR      "savedata"
-#define SAVEDATACHECK_DIR "savedatacheck"
-#define SYSDATA_DIR       "sysdata"
-#define SYSSAVEDATA_DIR   "syssavedata"
-#define SHADERCACHE_DIR   "shader_cache"
-#define STATESAVES_DIR    "state_saves"
-#define SCREENSHOTS_DIR   "screenShots"
-#define DUMP_DIR          "dump"
-#define DUMP_TEXTURES_DIR "textures"
-#define DUMP_FRAMES_DIR   "frames"
-#define DUMP_AUDIO_DIR    "audio"
-#define LOGS_DIR          "logs"
-#define SHADERS_DIR       "shaders"
-#define SYSCONF_DIR       "sysconf"
+#define CONFIG_DIR               "config"
+#define GAMECONFIG_DIR           "game_config"
+#define MAPS_DIR                 "maps"
+#define CACHE_DIR                "cache"
+#define SDMC_DIR                 "sdmc"
+#define EXTSAVEDATA_DIR          "sdmc/Nintendo 3DS/extdata"
+#define SHAREDEXTSAVEDATA_DIR    "nand/data/extdata"
+#define SAVEDATA_DIR             "savedata"
+#define SAVEDATACHECK_DIR        "savedatacheck"
+#define SYSDATA_DIR              "sysdata"
+#define SYSSAVEDATA_DIR          "nand/data/sysdata"
+#define SHADERCACHE_DIR          "shader_cache"
+#define STATESAVES_DIR           "state_saves"
+#define SCREENSHOTS_DIR          "screenShots"
+#define DUMP_DIR                 "dump"
+#define DUMP_TEXTURES_DIR        "textures"
+#define DUMP_FRAMES_DIR          "frames"
+#define DUMP_AUDIO_DIR           "audio"
+#define LOGS_DIR                 "logs"
+#define SHADERS_DIR              "shaders"
+#define SYSCONF_DIR              "sysconf"
 
 // Filenames
 // Files in the directory returned by GetUserPath(D_CONFIG_IDX)
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 0a6cd80c8..f8d140d84 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -677,6 +677,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
         paths[D_CACHE_IDX]          = paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
         paths[D_SDMC_IDX]           = paths[D_USER_IDX] + SDMC_DIR DIR_SEP;
         paths[D_EXTSAVEDATA]        = paths[D_USER_IDX] + EXTSAVEDATA_DIR DIR_SEP;
+        paths[D_SHAREDEXTSAVEDATA]  = paths[D_USER_IDX] + SHAREDEXTSAVEDATA_DIR DIR_SEP;
         paths[D_SAVEDATA_IDX]       = paths[D_USER_IDX] + SAVEDATA_DIR DIR_SEP;
         paths[D_SAVEDATACHECK_IDX]  = paths[D_USER_IDX] + SAVEDATACHECK_DIR DIR_SEP;
         paths[D_SYSDATA_IDX]        = paths[D_USER_IDX] + SYSDATA_DIR DIR_SEP;
@@ -723,6 +724,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
             paths[D_CACHE_IDX]          = paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
             paths[D_SDMC_IDX]           = paths[D_USER_IDX] + SDMC_DIR DIR_SEP;
             paths[D_EXTSAVEDATA]        = paths[D_USER_IDX] + EXTSAVEDATA_DIR DIR_SEP;
+            paths[D_SHAREDEXTSAVEDATA]  = paths[D_USER_IDX] + SHAREDEXTSAVEDATA_DIR DIR_SEP;
             paths[D_SAVEDATA_IDX]       = paths[D_USER_IDX] + SAVEDATA_DIR DIR_SEP;
             paths[D_SAVEDATACHECK_IDX]  = paths[D_USER_IDX] + SAVEDATACHECK_DIR DIR_SEP;
             paths[D_SYSSAVEDATA_IDX]    = paths[D_USER_IDX] + SYSSAVEDATA_DIR DIR_SEP;
diff --git a/src/common/file_util.h b/src/common/file_util.h
index c83ecd87d..4d6155f1f 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -28,6 +28,7 @@ enum {
     D_SCREENSHOTS_IDX,
     D_SDMC_IDX,
     D_EXTSAVEDATA,
+    D_SHAREDEXTSAVEDATA,
     D_SAVEDATA_IDX,
     D_SAVEDATACHECK_IDX,
     D_SYSDATA_IDX,