From 4381cdd837155afc7f3edf523f019be3710aded0 Mon Sep 17 00:00:00 2001
From: Adubbz <Adubbz@users.noreply.github.com>
Date: Thu, 4 Jul 2019 13:24:50 +1000
Subject: [PATCH] Fix wrong struct ordering

---
 nx/include/switch/services/fs.h | 10 +++++-----
 nx/source/services/fs.c         |  9 +++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/nx/include/switch/services/fs.h b/nx/include/switch/services/fs.h
index 7ad20b4a..8b773379 100644
--- a/nx/include/switch/services/fs.h
+++ b/nx/include/switch/services/fs.h
@@ -80,14 +80,14 @@ typedef struct
 /// SaveCreate Struct
 typedef struct
 {
-    u64 journalSize;
-    u64 flags;
-    u64 blockSize;
     u64 size;
-    u32 unk_x20;
+    u64 journalSize;
+    u64 blockSize;
+    u64 ownerId;
+    u32 flags;
     u8 SaveDataSpaceId;
     u8 unk_x25;
-    u8 uninitialized[0x1A];
+    u8 padding[0x1A];
 } FsSaveCreate;
 
 typedef struct
diff --git a/nx/source/services/fs.c b/nx/source/services/fs.c
index c3524ff5..1d510eec 100644
--- a/nx/source/services/fs.c
+++ b/nx/source/services/fs.c
@@ -709,11 +709,12 @@ Result fsCreate_SystemSaveDataWithOwner(FsSaveDataSpaceId space_id, u64 save_dat
     save.userID = (u128)user_id | ((u128)owner_id << 64);
     save.saveID = save_data_id;
     memset(&create, 0, sizeof(create));
-    create.SaveDataSpaceId = space_id;
-    create.blockSize = 0x4000;
-    create.journalSize = journal_size;
-    create.flags = flags;
     create.size = size;
+    create.journalSize = journal_size;
+    create.blockSize = 0x4000;
+    create.ownerId = owner_id; 
+    create.flags = flags;
+    create.SaveDataSpaceId = space_id;
 
     return fsCreateSaveDataFileSystemBySystemSaveDataId(&save, &create);
 }