Add CardMgrWork struct

Author: Zephiles

ttyd-tools/rel/include/ttyd/cardmgr.h

@@ -1,9 +1,48 @@
 #pragma once
 
+#include "gc/card.h"
+
 #include <cstdint>
 
 namespace ttyd::cardmgr {
 
+struct CardMgrWork
+{
+    uint16_t wFlags;
+    uint16_t unk_2;
+    void *workArea;
+    int32_t memCardSlot;
+    uint32_t unk_C;
+    uint32_t unk_10;
+    uint32_t unk_14;
+    uint32_t unk_18;
+    gc::card::CARDFileInfo fileInfo;
+    gc::card::CARDStat stat;
+    uint32_t code; // Return value from CARD functions
+    uint32_t unk_A0;
+    uint32_t unk_A4;
+    void *fileData; // Place where all 4 files are loaded to for the file select menu
+    void *unk_AC;
+    void *unk_B0;
+    uint32_t unk_B4;
+    uint32_t unk_B8;
+    uint32_t unk_BC;
+    uint32_t unk_C0;
+    uint32_t unk_C4;
+    uint32_t unk_C8;
+    uint32_t unk_CC;
+    uint32_t unk_D0;
+    uint32_t unk_D4;
+    uint32_t unk_D8;
+    uint32_t unk_DC;
+    uint32_t unk_E0;
+    uint32_t unk_E4;
+    uint32_t unk_E8;
+    uint32_t unk_EC;
+} __attribute__((__packed__));
+
+static_assert(sizeof(CardMgrWork) == 0xF0);
+
 extern "C" {
 
 // memcard_open
@@ -35,7 +74,7 @@ extern "C" {
 // cardBufReset
 // cardGetFilePtr
 
-extern void *cardMgrWorkPointer;
+extern CardMgrWork *cardMgrWorkPointer;
 
 }
 

ttyd-tools/rel/source/global.cpp

@@ -3,7 +3,7 @@
 
 namespace mod {
 
-const char *VersionNumber = "v3.0.51";
+const char *VersionNumber = "v3.0.52d";
 
 const char *RootLines[] = 
 {

ttyd-tools/rel/source/memcard.cpp

@@ -38,9 +38,7 @@ int32_t checkForMemoryCard()
 
 int32_t mountCard()
 {
-    void *WorkArea = *reinterpret_cast<uint32_t **>(
-        reinterpret_cast<uint32_t>(ttyd::cardmgr::cardMgrWorkPointer) + 0x4);
-    
+    void *WorkArea = ttyd::cardmgr::cardMgrWorkPointer->workArea;
     int32_t ReturnCode = gc::card::CARDMountAsync(CARD_SLOT_A, WorkArea, nullptr, nullptr);
     return finishAsyncFunction(ReturnCode);
 }