diff --git a/retail/bootloaderi/source/arm7/hook_arm9.c b/retail/bootloaderi/source/arm7/hook_arm9.c index 191341996..53b6d403c 100644 --- a/retail/bootloaderi/source/arm7/hook_arm9.c +++ b/retail/bootloaderi/source/arm7/hook_arm9.c @@ -337,7 +337,7 @@ int hookNdsRetailArm9( configureRomMap(ce9, ndsHeader, dataToPreloadAddr, dsiMode); for (u32 i = 0; i < dataToPreloadSize/*+dataToPreloadSize[1]*/; i += cacheBlockSize) { ce9->cacheAddress += cacheBlockSize; - romLocationAdjust(ndsHeader, laterSdk, (ce9->valueBits & b_dsiBios), (ce9->valueBits & b_isSdk5), &ce9->cacheAddress); + romLocationAdjust(ndsHeader, laterSdk, (ce9->valueBits & b_isSdk5), (ce9->valueBits & b_dsiBios), &ce9->cacheAddress); dataToPreloadSizeAligned += cacheBlockSize; } ce9->cacheSlots -= dataToPreloadSizeAligned/cacheBlockSize; @@ -382,7 +382,7 @@ int hookNdsRetailArm9( u32 addr = ce9->cacheAddress; for (int slot = 0; slot < ce9->cacheSlots; slot++) { - romLocationAdjust(ndsHeader, laterSdk, (ce9->valueBits & b_dsiBios), (ce9->valueBits & b_isSdk5), &addr); + romLocationAdjust(ndsHeader, laterSdk, (ce9->valueBits & b_isSdk5), (ce9->valueBits & b_dsiBios), &addr); cacheAddressTable[slot] = addr; addr += cacheBlockSize; } diff --git a/retail/bootloaderi/source/arm7/main.arm7.c b/retail/bootloaderi/source/arm7/main.arm7.c index 270395fd2..c4bc7779b 100644 --- a/retail/bootloaderi/source/arm7/main.arm7.c +++ b/retail/bootloaderi/source/arm7/main.arm7.c @@ -831,7 +831,7 @@ bool romLocationAdjust(const tNDSHeader* ndsHeader, const bool laterSdk, const b *romLocation += 0x4000; } else if (*romLocation == 0x0CFE0000 && !ntrType) { *romLocation += 0x20000; - } else if (*romLocation == 0x0CFFC000 && dsiBios) { + } else if (*romLocation == 0x0CFFC000 && (dsiBios || isSdk5)) { *romLocation += 0x4000; } if (*romLocation == (consoleModel > 0 ? 0x0E000000 : 0x0D000000)) {