ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revert my last commit, this is wrong way;

This commit is contained in:
mtabachenko 2013-11-09 23:08:44 +00:00
parent 4c50354b0e
commit 40b58be6ba
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desmume/src/NDSSystem.cpp
View File

@ -487,6 +487,11 @@ void GameInfo::closeROM()
u32 GameInfo::readROM(u32 pos)
{
//TODO - this should not be done here! it's a property of the slot-1 device, not the rom!
//required only for FAKE boot
if ((romType == ROM_NDS) && (pos < 0x8000) && (pos >= 0x4000))
return *(u32*)(secureArea + (pos - 0x4000));
if (!romdata)
{
u32 data;
@ -2207,9 +2212,7 @@ bool NDS_FakeBoot()
u32 dst = header->ARM9cpy;
for(u32 i = 0; i < (header->ARM9binSize>>2); ++i)
{
u32 tmp = ((gameInfo.romType == ROM_NDS) && (src < 0x8000) && (src >= 0x4000))?*(u32*)(gameInfo.secureArea + (src - 0x4000)):gameInfo.readROM(src);
_MMU_write32<ARMCPU_ARM9>(dst, tmp);
_MMU_write32<ARMCPU_ARM9>(dst, gameInfo.readROM(src));
dst += 4;
src += 4;