From d0af89924edf4e14a092e5352808f6a2ce44d53a Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Tue, 2 Jun 2020 00:25:29 +0200
Subject: remove requirement for initmem7/9.bin (but this requires augmented
 BIOS dumps, we'll get there)

---
 src/NDSCart.cpp | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/NDSCart.cpp')

diff --git a/src/NDSCart.cpp b/src/NDSCart.cpp
index b326dd6..a5e0f41 100644
--- a/src/NDSCart.cpp
+++ b/src/NDSCart.cpp
@@ -562,17 +562,10 @@ void Key1_ApplyKeycode(u32* keycode, u32 mod)
 void Key1_InitKeycode(bool dsi, u32 idcode, u32 level, u32 mod)
 {
     // TODO: source the key data from different possible places
-    if (NDS::ConsoleType == 1)
-    {
-        if (dsi)
-            memcpy(Key1_KeyBuf, &DSi::ARM7Init[0x254], 0x1048); // hax
-        else
-            memcpy(Key1_KeyBuf, &DSi::ITCMInit[0x4894], 0x1048); // hax
-    }
+    if (dsi && NDS::ConsoleType==1)
+        memcpy(Key1_KeyBuf, &DSi::ARM7iBIOS[0xC6D0], 0x1048); // hax
     else
-    {
         memcpy(Key1_KeyBuf, &NDS::ARM7BIOS[0x30], 0x1048); // hax
-    }
 
     u32 keycode[3] = {idcode, idcode>>1, idcode<<1};
     if (level >= 1) Key1_ApplyKeycode(keycode, mod);
-- 
cgit v1.2.3