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

GBHawk: Pass some new tests and fix some errors

This commit is contained in:
alyosha-tas 2018-03-23 19:49:54 -04:00
parent 6e72e47c1c
commit dc38794dad
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
View File

@ -221,12 +221,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
in_vblank = true; // we start off in vblank since the LCD is off
in_vblank_old = true;
// Start off with RAM all 0xFF (the game 'X' (proto) expects this)
for (int i = 0; i < RAM.Length; i++)
{
RAM[i] = 0xFF;
}
Register_Reset();
timer.Reset();
ppu.Reset();
@ -333,6 +327,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
case 5:
cart_RAM = new byte[0x10000];
break;
case 0:
Console.WriteLine("Mapper Number indicates Battery Backed RAM but none present.");
Console.WriteLine("Disabling Battery Setting.");
has_bat = false;
break;
}
// Sachen maper not known to have RAM

10
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/PPU.cs
View File

@ -108,7 +108,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
case 0xFF43: ret = scroll_x; break; // SCX
case 0xFF44: ret = LY; break; // LY
case 0xFF45: ret = LYC; break; // LYC
case 0xFF46: ret = 0xFF; break; // DMA (not readable?) /*ret = DMA_addr; */
case 0xFF46: ret = DMA_addr; break; // DMA
case 0xFF47: ret = BGP; break; // BGP
case 0xFF48: ret = obj_pal_0; break; // OBP0
case 0xFF49: ret = obj_pal_1; break; // OBP1
@ -203,7 +203,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
// the cpu can't access memory during this time, but we still need the ppu to be able to.
DMA_start = false;
DMA_byte = Core.ReadMemory((ushort)((DMA_addr << 8) + DMA_inc));
// Gekkio reports that A14 being high on DMA transfers always represent WRAM accesses
// So transfers nominally from higher memory areas are actually still from there (i.e. FF -> DF)
byte DMA_actual = DMA_addr;
if (DMA_addr > 0xDF) { DMA_actual &= 0xDF; }
DMA_byte = Core.ReadMemory((ushort)((DMA_actual << 8) + DMA_inc));
DMA_start = true;
}
else if ((DMA_clock % 4) == 3)
@ -1075,7 +1079,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
scroll_x = 0;
LY = 0;
LYC = 0;
DMA_addr = 0;
DMA_addr = 0xFF;
BGP = 0xFF;
obj_pal_0 = 0xFF;
obj_pal_1 = 0xFF;