Fix private header dumping take #2

Author: d0k3

source/gamecart/gamecart.c

@@ -11,13 +11,12 @@
 
 typedef struct {
     NcsdHeader ncsd;
-    u8  cinfo[0x800];
-    NcchHeader ncch;
     u32 card2_offset;
-    u8  dinfo[0x300 - 0x4];
-    u8  padding[0x3000 - (0x200 + 0x300)];
+    u8  cinfo[0x1000 - (0x200 + sizeof(u32))];
+    NcchHeader ncch;
+    u8  padding[0x3000 - 0x200];
     u8  private[PRIV_HDR_SIZE];
-    u8  unused[0xC000 - PRIV_HDR_SIZE]; // 0xFF
+    u8  unused[0x4000 + 0x8000 - PRIV_HDR_SIZE]; // 0xFF
     u32 cart_type;
     u32 cart_id;
     u64 cart_size;
@@ -67,7 +66,7 @@ u32 InitCardRead(CartData* cdata) {
     cdata->cart_id = Cart_GetID();
     cdata->cart_type = (cdata->cart_id & 0x10000000) ? CART_CTR : CART_NTR;
     if (cdata->cart_type & CART_CTR) {
-        memset(cdata, 0xFF, 0x4000); // switch the padding to 0xFF
+        memset(cdata, 0xFF, 0x8000); // switch the padding to 0xFF
 
         // init, NCCH header
         static u32 sec_keys[4];
@@ -201,8 +200,7 @@ u32 ReadCartBytes(u8* buffer, u32 offset, u32 count, CartData* cdata) {
 u32 ReadCartPrivateHeader(u8* buffer, u32 offset, u32 count, CartData* cdata) {
     if (!(cdata->cart_type & CART_CTR)) return 1;
     if (offset < PRIV_HDR_SIZE) {
-        CartDataCtr* cdata_i = (CartDataCtr*)(void*) cdata;
-        u8* priv_hdr = cdata_i->private;
+        u8* priv_hdr = cdata->header + 0x4000;
         if (offset + count > PRIV_HDR_SIZE) count = PRIV_HDR_SIZE - offset;
         memcpy(buffer, priv_hdr + offset, count);
     }