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

Fixed opcode error when implementing Dwedit's fix. 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@11 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
mudlord 2007-11-01 06:31:21 +00:00
parent 3a4a57fa5a
commit 0293de0a27
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gb/GB.cpp
View File

@ -674,7 +674,7 @@ void gbWriteMemory(register u16 address, register u8 value)
return; return;
} }
if (address<0xE000) if (address<0xE000)
{ {
gbMemoryMap[address>>12][address & 0x0fff] = value; gbMemoryMap[address>>12][address & 0x0fff] = value;
return; return;
@ -1226,11 +1226,12 @@ u8 gbReadOpcode(register u16 address)
} }
} }
break; break;
if (address>=0xE000 && address<0xFE00)
{
return gbMemoryMap[(address-0x2000)>>12][address & 0x0fff];
}
} }
if (address>=0xE000 && address<0xFE00) return gbMemoryMap[address>>12][address & 0x0fff];
{
return gbMemoryMap[(address-0x2000)>>12][address & 0x0fff];
}
} }
u8 gbReadMemory(register u16 address) u8 gbReadMemory(register u16 address)
@ -1394,11 +1395,12 @@ u8 gbReadMemory(register u16 address)
case 0xff: case 0xff:
return register_IE; return register_IE;
} }
} if (address>=0xE000 && address<0xFE00)
if (address>=0xE000 && address<0xFE00)
{ {
return gbMemoryMap[(address-0x2000)>>12][address & 0x0fff]; return gbMemoryMap[(address-0x2000)>>12][address & 0x0fff];
} }
}
return gbMemoryMap[address>>12][address & 0x0fff];
} }
void gbVblank_interrupt() void gbVblank_interrupt()