Use new libnds function for setting NTR clock speeds on arm9

ApacheThunder · Feb 16, 2017 · 910c8f8 · 910c8f8
1 parent dfed476
commit 910c8f8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/arm7/source/main.c b/arm7/source/main.c
@@ -64,7 +64,8 @@ void TWL_ResetSlot1() {
 
 int main(void) {
 
-	REG_SCFG_CLK = 0x0187;
+	// libnds sets TWL clock speeds on boot now.
+	// REG_SCFG_CLK = 0x0187;
 
 	irqInit();
 	fifoInit();

diff --git a/arm9/source/main.cpp b/arm9/source/main.cpp
@@ -45,7 +45,8 @@ int main(int argc, const char* argv[]) {
 	bool UseNTRSplash = true;
 	bool EnableSD = false;
 
-	REG_SCFG_CLK = 0x85;
+	// libnds sets this now.
+	// REG_SCFG_CLK = 0x85;
 
 	swiWaitForVBlank();
 
@@ -76,7 +77,9 @@ int main(int argc, const char* argv[]) {
 
 		if( UseNTRSplash == true ) {
 			fifoSendValue32(FIFO_USER_04, 1);
-			REG_SCFG_CLK = 0x80;
+			// REG_SCFG_CLK = 0x80;
+			// New libnds function for going back to NTR clock speeds
+			setCpuClock(false);
 			swiWaitForVBlank();
 		}
 

diff --git a/nds/ntr_launcher.ini b/nds/ntr_launcher.ini
@@ -3,4 +3,4 @@ DISABLEANIMATION = 0
 NTRCLOCK = 1
 ENABLESD = 0
 TWLMODE = 0
-RESETSLOT1 = 1
+RESETSLOT1 = 0