From 453eedacfad18ce6244e34be1a131ccbf98e1526 Mon Sep 17 00:00:00 2001
From: Jcw87 <Jcw87@users.noreply.github.com>
Date: Sat, 16 Sep 2023 10:18:45 -0700
Subject: [PATCH] JKRArchive (#1930)

---
 include/JSystem/JKernel/JKRAramArchive.h | 2 --
 include/JSystem/JKernel/JKRArchive.h     | 2 ++
 include/JSystem/JKernel/JKRCompArchive.h | 2 --
 include/JSystem/JKernel/JKRDvdArchive.h  | 2 --
 include/JSystem/JKernel/JKRMemArchive.h  | 2 --
 libs/JSystem/JKernel/JKRDvdArchive.cpp   | 3 ++-
 6 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/include/JSystem/JKernel/JKRAramArchive.h b/include/JSystem/JKernel/JKRAramArchive.h
index 4c638dbdd8c..5f8d2841361 100644
--- a/include/JSystem/JKernel/JKRAramArchive.h
+++ b/include/JSystem/JKernel/JKRAramArchive.h
@@ -27,8 +27,6 @@ public:
 private:
     /* 0x00 */  // vtable
     /* 0x04 */  // JKRArchive
-    /* 0x5C */ JKRCompression mCompression;
-    /* 0x60 */ EMountDirection mMountDirection;
     /* 0x64 */ JKRAramBlock* mBlock;
     /* 0x68 */ JKRDvdFile* mDvdFile;
 };  // Size = 0x6C
diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h
index b1b6b13d2b3..7f89bc3e2bd 100644
--- a/include/JSystem/JKernel/JKRArchive.h
+++ b/include/JSystem/JKernel/JKRArchive.h
@@ -182,6 +182,8 @@ public:
 
 protected:
     /* 0x58 */ u32 field_0x58;
+    /* 0x5C */ JKRCompression mCompression;
+    /* 0x60 */ EMountDirection mMountDirection;
 
 public:
     static JKRArchive* check_mount_already(s32, JKRHeap*);
diff --git a/include/JSystem/JKernel/JKRCompArchive.h b/include/JSystem/JKernel/JKRCompArchive.h
index 98da6327d42..338332fb6a5 100644
--- a/include/JSystem/JKernel/JKRCompArchive.h
+++ b/include/JSystem/JKernel/JKRCompArchive.h
@@ -24,8 +24,6 @@ public:
 private:
     /* 0x00 */  // vtable
     /* 0x04 */  // JKRArchive
-    /* 0x5C */ int mCompression;
-    /* 0x60 */ EMountDirection mMountDirection;
     /* 0x64 */ int field_0x64;
     /* 0x68 */ JKRAramBlock* mAramPart;
     /* 0x6C */ int field_0x6c;
diff --git a/include/JSystem/JKernel/JKRDvdArchive.h b/include/JSystem/JKernel/JKRDvdArchive.h
index e2e6b408be4..fe72cd8f3aa 100644
--- a/include/JSystem/JKernel/JKRDvdArchive.h
+++ b/include/JSystem/JKernel/JKRDvdArchive.h
@@ -23,8 +23,6 @@ public:
 private:
     /* 0x00 */  // vtable
     /* 0x04 */  // JKRArchive
-    /* 0x5C */ JKRCompression mCompression;
-    /* 0x60 */ EMountDirection mMountDirection;
     /* 0x64 */ s32 field_0x64;
     /* 0x68 */ JKRDvdFile* mDvdFile;
 };
diff --git a/include/JSystem/JKernel/JKRMemArchive.h b/include/JSystem/JKernel/JKRMemArchive.h
index ba76ab1ea23..eb09c0b2009 100644
--- a/include/JSystem/JKernel/JKRMemArchive.h
+++ b/include/JSystem/JKernel/JKRMemArchive.h
@@ -31,8 +31,6 @@ public:
 private:
     /* 0x00 */  // vtable
     /* 0x04 */  // JKRArchive
-    /* 0x5C */ JKRCompression mCompression;
-    /* 0x60 */ EMountDirection mMountDirection;
     /* 0x64 */ SArcHeader* mArcHeader;
     /* 0x68 */ u8* mArchiveData;
     /* 0x6C */ bool mIsOpen;
diff --git a/libs/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/JKernel/JKRDvdArchive.cpp
index 3e0c856daa1..903a1cc1e2c 100644
--- a/libs/JSystem/JKernel/JKRDvdArchive.cpp
+++ b/libs/JSystem/JKernel/JKRDvdArchive.cpp
@@ -80,7 +80,8 @@ extern "C" u8 sSystemHeap__7JKRHeap[4];
 /* 802D7BF0-802D7C98 2D2530 00A8+00 0/0 1/1 0/0 .text
  * __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection       */
 JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection)
-    : JKRArchive(entryNum, MOUNT_DVD), mMountDirection(mountDirection) {
+    : JKRArchive(entryNum, MOUNT_DVD) {
+    mMountDirection = mountDirection;
     if (!open(entryNum))
         return;