stuff

Author: edo9300

src/DSi.cpp

@@ -147,8 +147,8 @@ void DSi::Reset()
     crc_full[0] = CRC32(ARM9iBIOS.data(), 0x10000);
     crc_full[1] = CRC32(ARM7iBIOS.data(), 0x10000);
 
-    bool bios9full = (crc_low[0] != ARM9iBIOSLowCRC32) || (crc_full[0] == ARM9iBIOSCRC32);
-    bool bios7full = (crc_low[1] != ARM7iBIOSLowCRC32) || (crc_full[1] == ARM7iBIOSCRC32);
+    bool bios9full = true; //(crc_low[0] != ARM9iBIOSLowCRC32) || (crc_full[0] == ARM9iBIOSCRC32);
+    bool bios7full = true; //(crc_low[1] != ARM7iBIOSLowCRC32) || (crc_full[1] == ARM7iBIOSCRC32);
     FullBIOSBoot = bios9full && bios7full;
     Log(LogLevel::Debug, "DSi: full BIOS boot = %d\n", FullBIOSBoot);
 

src/NDSCart.cpp

@@ -137,8 +137,8 @@ void NDSCartSlot::Key1_LoadKeyBuf(bool dsimode) noexcept
         {
             // load from ARM9 BIOS at 0x99A0
 
-            const u8* bios = dsi.ARM9iBIOS.data();
-            memcpy(Key1_KeyBuf.data(), bios + 0x99A0, sizeof(Key1_KeyBuf));
+            const u8* bios = dsi.ARM7iBIOS.data();
+            memcpy(Key1_KeyBuf.data(), bios + 0xB688, sizeof(Key1_KeyBuf));
             Platform::Log(LogLevel::Debug, "NDSCart: Initialized Key1_KeyBuf from ARM9i BIOS\n");
         }
     }
@@ -163,9 +163,24 @@ void NDSCartSlot::Key1_LoadKeyBuf(bool dsimode) noexcept
 
 void NDSCartSlot::Key1_InitKeycode(bool dsi, u32 idcode, u32 level, u32 mod) noexcept
 {
+	Key1_LoadKeyBuf(dsi);
+	u32 keycode[3] = {idcode, idcode>>1, idcode<<1};
+	//Key1_ApplyKeycode(keycode, mod);
+	u32 temp[2] = {0,0};
+
+    for (u32 i = 0; i <= 0x11; i++)
+    {
+        Key1_KeyBuf[i] ^= ByteSwap(keycode[0]);
+    }
+    for (u32 i = 0; i <= 0x410; i+=2)
+    {
+        Key1_Encrypt(temp);
+        Key1_KeyBuf[i  ] = temp[1];
+        Key1_KeyBuf[i+1] = temp[0];
+    }
+	return;
     Key1_LoadKeyBuf(dsi);
 
-    u32 keycode[3] = {idcode, idcode>>1, idcode<<1};
     if (level >= 1) Key1_ApplyKeycode(keycode, mod);
     if (level >= 2) Key1_ApplyKeycode(keycode, mod);
     if (level >= 3)