From 81e98b5e129f7018f1379d04ad42c0dc1ca5420b Mon Sep 17 00:00:00 2001
From: StapleButter <thetotalworm@gmail.com>
Date: Fri, 27 Apr 2018 19:26:46 +0200
Subject: direct boot: init cart ID from NDSCart::CartID instead of hardcoding
 it

---
 src/NDS.cpp   | 8 ++++----
 src/NDSCart.h | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/NDS.cpp b/src/NDS.cpp
index ca84f98..fa7cb84 100644
--- a/src/NDS.cpp
+++ b/src/NDS.cpp
@@ -189,15 +189,15 @@ void SetupDirectBoot()
         ARM9Write32(0x027FFE00+i, tmp);
     }
 
-    ARM9Write32(0x027FF800, 0x00001FC2);
-    ARM9Write32(0x027FF804, 0x00001FC2);
+    ARM9Write32(0x027FF800, NDSCart::CartID);
+    ARM9Write32(0x027FF804, NDSCart::CartID);
     ARM9Write16(0x027FF808, *(u16*)&NDSCart::CartROM[0x15E]);
     ARM9Write16(0x027FF80A, *(u16*)&NDSCart::CartROM[0x6C]);
 
     ARM9Write16(0x027FF850, 0x5835);
 
-    ARM9Write32(0x027FFC00, 0x00001FC2);
-    ARM9Write32(0x027FFC04, 0x00001FC2);
+    ARM9Write32(0x027FFC00, NDSCart::CartID);
+    ARM9Write32(0x027FFC04, NDSCart::CartID);
     ARM9Write16(0x027FFC08, *(u16*)&NDSCart::CartROM[0x15E]);
     ARM9Write16(0x027FFC0A, *(u16*)&NDSCart::CartROM[0x6C]);
 
diff --git a/src/NDSCart.h b/src/NDSCart.h
index 5bec38d..7267ad3 100644
--- a/src/NDSCart.h
+++ b/src/NDSCart.h
@@ -36,6 +36,8 @@ extern u8 EncSeed1[5];
 extern u8* CartROM;
 extern u32 CartROMSize;
 
+extern u32 CartID;
+
 bool Init();
 void DeInit();
 void Reset();
-- 
cgit v1.2.3