Skip to content

Commit 2a5944f

Browse files
committed
Remove using a donor ROM for DSi-Enhanced games (but keep using it for DSiWarehax)
Fixes #1924
1 parent 89b99bc commit 2a5944f

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

retail/arm9/source/conf_sd.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,7 @@ int loadFromSD(configuration* conf, const char *bootstrapPath) {
12021202
if (conf->useSdk20Donor) {
12031203
donorNdsFile = fopen(conf->donor20Path, "rb");
12041204
twlDonor = false;
1205-
} else if ((REG_SCFG_EXT7 == 0 || (!conf->isDSiWare && a7mbk6 == 0x00403000))
1205+
} else if (REG_SCFG_EXT7 == 0
12061206
&& (conf->dsiMode > 0 || conf->isDSiWare) && (a7mbk6 == (dsiEnhancedMbk ? 0x080037C0 : 0x00403000) || (romTid[0] == 'H' && ndsArm7Size < 0xC000 && ndsArm7idst == 0x02E80000 && (REG_MBK9 & 0x00FFFFFF) != 0x00FFFF0F))) {
12071207
if (romTid[0] == 'H' && ndsArm7Size < 0xC000 && ndsArm7idst == 0x02E80000) {
12081208
if (!nandMounted && strncmp((dsiEnhancedMbk ? conf->donorTwl0Path : conf->donorTwlOnly0Path), "nand:", 5) == 0) {

retail/bootloaderi/source/arm7/main.arm7.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1792,11 +1792,6 @@ int arm7_main(void) {
17921792
} else { */
17931793
u32 add = 0x8FC000; // 0x02FFC000
17941794
u16 len = isDSiWare ? 0x1000 : 0x17B0;
1795-
if (*(u32*)0x02FFE1A0 != 0x00403000) {
1796-
const u16 size = 0x1850;
1797-
add -= size;
1798-
len += size;
1799-
}
18001795
tonccpy((char*)0x02700000+add, (char*)0x02700000, len); // Move FAT table cache elsewhere
18011796
romFile->fatTableCache = (u32*)((u32)romFile->fatTableCache+add);
18021797
savFile->fatTableCache = (u32*)((u32)savFile->fatTableCache+add);

0 commit comments

Comments
 (0)