Change the sdengine location to WRAM-A

Author: ahezard

bootloader/source/arm7clear.s

@@ -47,17 +47,8 @@ clear_IWRAM_loop:
 
 	// clear most of EWRAM - except after RAM end - 0xc000, which has the bootstub
 	mov	r8, #0x02000000
-	
-	ldr	r9,=0x4004008
-	ldr	r9,[r9]
-	ands	r9,r9,#0x8000
-	bne	dsi_mode
 
 	mov	r9, #0x02400000
-	b	ds_mode
-dsi_mode:
-	mov	r9, #0x03000000	
-ds_mode:
 	sub	r9, #0x0000c000
 clear_EWRAM_loop:
 	stmia	r8!, {r0, r1, r2, r3, r4, r5, r6, r7}

bootloader/source/boot.c

@@ -66,7 +66,7 @@ void sdmmc_controller_init();
 
 #define CHEAT_ENGINE_LOCATION	0x027FE000
 #define CHEAT_DATA_LOCATION  	0x06010000
-#define SD_ENGINE_LOCATION  	0x03900000
+#define SD_ENGINE_LOCATION  	0x037C0000
 
 const char* bootName = "BOOT.NDS";
 

bootloader/source/hook.c

@@ -76,7 +76,7 @@ static const u32 homebrewSigPatched[5] = {
 	0xE5012008, // str    r2, [r1,#-8]     @ irqhandler
 	0xE501F004, // str    r0, [r1,#-4]     @ irqsig 
 	0xEA000000, // b      got_handler
-	0x03900010  // DCD 	  0x03900010       
+	0x037C0010  // DCD 	  0x037C0010       
 };
 
 static const int MAX_HANDLER_SIZE = 50;

nds-bootstrap.pnproj

@@ -1 +1 @@
-<Project name="nds-bootstrap"><Folder name="bootloader"><Folder name="source"><File path="bootloader\source\sdmmc.h"></File><File path="bootloader\source\arm7clear.s"></File><File path="bootloader\source\arm9clear.arm.c"></File><File path="bootloader\source\bios.s"></File><File path="bootloader\source\boot.c"></File><File path="bootloader\source\boot.h"></File><File path="bootloader\source\card.h"></File><File path="bootloader\source\cheat_engine.s"></File><File path="bootloader\source\common.h"></File><File path="bootloader\source\disc_io.h"></File><File path="bootloader\source\dldi_patcher.c"></File><File path="bootloader\source\dldi_patcher.h"></File><File path="bootloader\source\encryption.c"></File><File path="bootloader\source\encryption.h"></File><File path="bootloader\source\fat.c"></File><File path="bootloader\source\fat.h"></File><File path="bootloader\source\io_dldi.h"></File><File path="bootloader\source\io_dldi.s"></File><File path="bootloader\source\load_crt0.s"></File><File path="bootloader\source\read_bios.h"></File><File path="bootloader\source\read_bios.s"></File><File path="bootloader\source\sdmmc.c"></File><File path="bootloader\source\hook.c"></File><File path="bootloader\source\hook.h"></File></Folder><File path="bootloader\Makefile"></File><File path="bootloader\load.ld"></File></Folder><Folder name="arm7"><Folder name="source"><File path="arm7\source\main.c"></File><File path="arm7\source\ntrcheck.c"></File><File path="arm7\source\ntrcheck.h"></File><File path="arm7\source\cheat_engine_arm7.c"></File><File path="arm7\source\cheat_engine_arm7.h"></File><File path="arm7\source\sdmmcEngine.c"></File><File path="arm7\source\sdmmcEngine.h"></File></Folder><File path="arm7\Makefile"></File><File path="arm7\ds_arm7_ram.ld"></File><File path="arm7\ds_arm7_ram.specs"></File></Folder><Folder name="arm9"><Folder name="source"><File path="arm9\source\inifile.cpp"></File><File path="arm9\source\inifile.h"></File><File path="arm9\source\nds_loader_arm9.c"></File><File path="arm9\source\nds_loader_arm9.h"></File><File path="arm9\source\stringtool.cpp"></File><File path="arm9\source\stringtool.h"></File><File path="arm9\source\main.cpp"></File><File path="arm9\source\bootsplash.h"></File><File path="arm9\source\bootsplash.c"></File><File path="arm9\source\bios_decompress_callback.c"></File><File path="arm9\source\bios_decompress_callback.h"></File><File path="arm9\source\cheat.cpp"></File><File path="arm9\source\cheat.h"></File><File path="arm9\source\cheat_engine.c"></File><File path="arm9\source\cheat_engine.h"></File><File path="arm9\source\crc.c"></File><File path="arm9\source\crc.h"></File><File path="arm9\source\nds_card.c"></File><File path="arm9\source\nds_card.h"></File></Folder><File path="arm9\Makefile"></File></Folder><Folder name="bootstub"><File path="bootstub\Makefile"></File><File path="bootstub\bootstub.s"></File></Folder><Folder name="conf"><File path="conf\bootstrap.argv"></File><File path="conf\nds-bootstrap.ini"></File></Folder><Folder name="dldi"><Folder name="source"><File path="dldi\source\dldi_header.s"></File><File path="dldi\source\iointerface.c"></File><File path="dldi\source\sdmmc.c"></File><File path="dldi\source\sdmmc.h"></File></Folder><File path="dldi\dldi.ld"></File><File path="dldi\dsisd.ini"></File><File path="dldi\Makefile"></File></Folder><Folder name="sdengine"><Folder name="source"><File path="sdengine\source\bios.s"></File><File path="sdengine\source\debugprint.s"></File><File path="sdengine\source\sdmmc.c"></File><File path="sdengine\source\sdmmc.h"></File><File path="sdengine\source\sdmmcEngine.c"></File><File path="sdengine\source\sdmmcEngine.h"></File><File path="sdengine\source\sdmmc_engine_header.s"></File></Folder><File path="sdengine\Makefile"></File><File path="sdengine\sdengine.ld"></File></Folder><File path="Makefile"></File><File path="build_cia.bat"></File><File path="build_cia.sh"></File><File path="icon.bmp"></File><File path="patch_ndsheader_dsiware.py"></File></Project>
+<Project name="nds-bootstrap"><Folder name="bootloader"><Folder name="source"><File path="bootloader\source\sdmmc.h"></File><File path="bootloader\source\arm7clear.s"></File><File path="bootloader\source\arm9clear.arm.c"></File><File path="bootloader\source\bios.s"></File><File path="bootloader\source\boot.c"></File><File path="bootloader\source\boot.h"></File><File path="bootloader\source\card.h"></File><File path="bootloader\source\cheat_engine.s"></File><File path="bootloader\source\common.h"></File><File path="bootloader\source\disc_io.h"></File><File path="bootloader\source\dldi_patcher.c"></File><File path="bootloader\source\dldi_patcher.h"></File><File path="bootloader\source\encryption.c"></File><File path="bootloader\source\encryption.h"></File><File path="bootloader\source\fat.c"></File><File path="bootloader\source\fat.h"></File><File path="bootloader\source\io_dldi.h"></File><File path="bootloader\source\io_dldi.s"></File><File path="bootloader\source\load_crt0.s"></File><File path="bootloader\source\read_bios.h"></File><File path="bootloader\source\read_bios.s"></File><File path="bootloader\source\sdmmc.c"></File><File path="bootloader\source\hook.c"></File><File path="bootloader\source\hook.h"></File><File path="bootloader\source\mpu_setup.s"></File></Folder><File path="bootloader\Makefile"></File><File path="bootloader\load.ld"></File></Folder><Folder name="arm7"><Folder name="source"><File path="arm7\source\main.c"></File><File path="arm7\source\ntrcheck.c"></File><File path="arm7\source\ntrcheck.h"></File><File path="arm7\source\cheat_engine_arm7.c"></File><File path="arm7\source\cheat_engine_arm7.h"></File><File path="arm7\source\sdmmcEngine.c"></File><File path="arm7\source\sdmmcEngine.h"></File><File path="arm7\source\mpu_setup.s"></File></Folder><File path="arm7\Makefile"></File><File path="arm7\ds_arm7_ram.ld"></File><File path="arm7\ds_arm7_ram.specs"></File></Folder><Folder name="arm9"><Folder name="source"><File path="arm9\source\inifile.cpp"></File><File path="arm9\source\inifile.h"></File><File path="arm9\source\nds_loader_arm9.c"></File><File path="arm9\source\nds_loader_arm9.h"></File><File path="arm9\source\stringtool.cpp"></File><File path="arm9\source\stringtool.h"></File><File path="arm9\source\main.cpp"></File><File path="arm9\source\bootsplash.h"></File><File path="arm9\source\bootsplash.c"></File><File path="arm9\source\bios_decompress_callback.c"></File><File path="arm9\source\bios_decompress_callback.h"></File><File path="arm9\source\cheat.cpp"></File><File path="arm9\source\cheat.h"></File><File path="arm9\source\cheat_engine.c"></File><File path="arm9\source\cheat_engine.h"></File><File path="arm9\source\crc.c"></File><File path="arm9\source\crc.h"></File><File path="arm9\source\nds_card.c"></File><File path="arm9\source\nds_card.h"></File></Folder><File path="arm9\Makefile"></File></Folder><Folder name="bootstub"><File path="bootstub\Makefile"></File><File path="bootstub\bootstub.s"></File></Folder><Folder name="conf"><Folder name="no$gba"><File path="conf\no$gba\nds-bootstrap.ini"></File></Folder><File path="conf\bootstrap.argv"></File><File path="conf\nds-bootstrap.ini"></File></Folder><Folder name="dldi"><Folder name="source"><File path="dldi\source\dldi_header.s"></File><File path="dldi\source\iointerface.c"></File><File path="dldi\source\sdmmc.c"></File><File path="dldi\source\sdmmc.h"></File><File path="dldi\source\mpu_setup.s"></File></Folder><File path="dldi\dldi.ld"></File><File path="dldi\dsisd.ini"></File><File path="dldi\Makefile"></File></Folder><Folder name="sdengine"><Folder name="source"><File path="sdengine\source\bios.s"></File><File path="sdengine\source\debugprint.s"></File><File path="sdengine\source\sdmmc.c"></File><File path="sdengine\source\sdmmc.h"></File><File path="sdengine\source\sdmmcEngine.c"></File><File path="sdengine\source\sdmmcEngine.h"></File><File path="sdengine\source\sdmmc_engine_header.s"></File></Folder><File path="sdengine\Makefile"></File><File path="sdengine\sdengine.ld"></File></Folder><File path="Makefile"></File><File path="build_cia.bat"></File><File path="build_cia.sh"></File><File path="icon.bmp"></File><File path="patch_ndsheader_dsiware.py"></File></Project>

nds-bootstrap.pnps

@@ -1 +1 @@
-<pd><ViewState><e p="nds-bootstrap\arm9\source" x="true"></e><e p="nds-bootstrap\bootloader" x="true"></e><e p="nds-bootstrap\arm9" x="true"></e><e p="nds-bootstrap\bootloader\source" x="false"></e><e p="nds-bootstrap\sdengine" x="true"></e><e p="nds-bootstrap\arm7\source" x="true"></e><e p="nds-bootstrap\bootstub" x="true"></e><e p="nds-bootstrap\conf" x="false"></e><e p="nds-bootstrap\dldi" x="true"></e><e p="nds-bootstrap\dldi\source" x="true"></e><e p="nds-bootstrap" x="true"></e><e p="nds-bootstrap\arm7" x="true"></e><e p="nds-bootstrap\sdengine\source" x="true"></e></ViewState></pd>
+<pd><ViewState><e p="nds-bootstrap\bootloader" x="true"></e><e p="nds-bootstrap\arm9" x="false"></e><e p="nds-bootstrap\bootloader\source" x="true"></e><e p="nds-bootstrap\conf\no$gba" x="true"></e><e p="nds-bootstrap\sdengine" x="true"></e><e p="nds-bootstrap\arm7\source" x="true"></e><e p="nds-bootstrap\bootstub" x="true"></e><e p="nds-bootstrap\conf" x="true"></e><e p="nds-bootstrap\dldi" x="true"></e><e p="nds-bootstrap\dldi\source" x="true"></e><e p="nds-bootstrap" x="true"></e><e p="nds-bootstrap\arm7" x="true"></e><e p="nds-bootstrap\sdengine\source" x="true"></e></ViewState></pd>

patch_ndsheader_dsiware.py

@@ -379,22 +379,20 @@ def writeBlankuntilAddress(f_out, caddr, taddr):
 			MBK_1_5_Settings= 		'\x81\x85\x89\x8d\x80\x84\x88\x8c\x90\x94\x98\x9c\x80\x84\x88\x8c\x90\x94\x98\x9c',
 			MBK_6_8_Settings_ARM7= 	'\xc07\x00\x08@7\xc0\x07\x007@\x07',
 			MBK_6_8_Settings_ARM9= 	'\x00\x00\x00\x00@7\xc0\x07\x007@\x07',
-			#MBK_1_5_Settings= 		'\x81\x85\x89\x8d\x81\x85\x89\x91\x91\x95\x99\x91\x81\x85\x89\x91\x91\x95\x99\x91',
-			#MBK_6_8_Settings_ARM7= 	'\x00\x39\x40\x09\x40\x39\x80\x09\x80\x39\xc0\x09',
-			#MBK_6_8_Settings_ARM9= 	'\x00\x30\x00\x00\x00\x30\x00\x00\x00\x30\x00\x00',
 			accessControl=			0x00000138,
+			#arm7ScfgExtMask= 		0x80044000,
 			arm7ScfgExtMask=		0x80040000,
+			#reserved_flags=		0x01000000,
 			reserved_flags=			0x00000000,
 			arm7iLoadAddress= 		0x2E80000,
 			arm7iRomOffset= 		arm7iRomOffset,
 			arm7iSize= 				arm7isize,
 			arm9iLoadAddress= 		0x2400000,
 			arm9iRomOffset= 		arm9iRomOffset,
-			arm9iSize= 				arm9isize,	
-			#global_MBK_9_Setting= 	'\x0f\x00\x00\x03',	
-			global_MBK_9_Setting= 	'\x0f\xff\xff\xfc',	
+			arm9iSize= 				arm9isize,			
+			global_MBK_9_Setting= 	'\x0f\x00\x00\x03',	
 			iconSize=				2112,		
-			pubSaveDataSize= 		00000,
+			pubSaveDataSize= 		81920,
 			regionFlags=			'\xff\xff\xff\xff',	
 			title_id=				srlHeaderPatched.gameCode[::-1]+"\x04\x00\x03\x00",
 			twlRomSize=				srlHeaderPatched.ntrRomSize+totaldsisize,

sdengine/sdengine.ld

@@ -4,7 +4,7 @@ ENTRY(_start)
 
 MEMORY {
 
-	vram	: ORIGIN = 0x03900000, LENGTH = 4K
+	vram	: ORIGIN = 0x037C0000, LENGTH = 4K
 }
 
 __vram_start	=	ORIGIN(vram);