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 bug in GB/GBC mode as described and detailed by Dwedit. 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@10 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
mudlord 2007-11-01 06:05:39 +00:00
parent a478e57898
commit 3a4a57fa5a
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
VBA.suo
View File

Binary file not shown.

44
src/gb/GB.cpp
View File

@ -586,12 +586,17 @@ bool gbIsGameboyRom(char * file)
void gbCopyMemory(u16 d, u16 s, int count)
{
while(count) {
gbMemoryMap[d>>12][d & 0x0fff] = gbMemoryMap[s>>12][s & 0x0fff];
s++;
d++;
count--;
}
if (s>=0xE000 && s<0xFE00)
{
s-=0x2000;
}
while(count)
{
gbMemoryMap[d>>12][d & 0x0fff] = gbMemoryMap[s>>12][s & 0x0fff];
s++;
d++;
count--;
}
}
void gbDoHdma()
@ -669,10 +674,16 @@ void gbWriteMemory(register u16 address, register u8 value)
return;
}
if(address < 0xfe00) {
gbMemoryMap[address>>12][address & 0x0fff] = value;
return;
}
if (address<0xE000)
{
gbMemoryMap[address>>12][address & 0x0fff] = value;
return;
}
if(address < 0xfe00)
{
gbMemoryMap[(address-0x2000)>>12][address & 0x0fff] = value;
return;
}
if(address < 0xff00) {
gbMemory[address] = value;
@ -1155,7 +1166,7 @@ u8 gbReadOpcode(register u16 address)
if(gbCheatMap[address])
return gbCheatRead(address);
switch(address & 0xf000) {
switch((address>>12) & 0x000f) {
case 0x0a:
case 0x0b:
if(mapperReadRAM)
@ -1216,7 +1227,10 @@ u8 gbReadOpcode(register u16 address)
}
break;
}
return gbMemoryMap[address>>12][address & 0x0fff];
if (address>=0xE000 && address<0xFE00)
{
return gbMemoryMap[(address-0x2000)>>12][address & 0x0fff];
}
}
u8 gbReadMemory(register u16 address)
@ -1381,8 +1395,10 @@ u8 gbReadMemory(register u16 address)
return register_IE;
}
}
return gbMemoryMap[address>>12][address & 0x0fff];
if (address>=0xE000 && address<0xFE00)
{
return gbMemoryMap[(address-0x2000)>>12][address & 0x0fff];
}
}
void gbVblank_interrupt()