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

GBHAwk: palette not writable during rendering: fixes lego racers

This commit is contained in:
alyosha-tas 2019-01-05 10:34:19 -06:00
parent e2ccff1c82
commit 292ee296dc
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
View File

@ -82,7 +82,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
case 0xFF54: ret = HDMA_dest_lo; break; // HDMA4 case 0xFF54: ret = HDMA_dest_lo; break; // HDMA4
case 0xFF55: ret = HDMA_ctrl; break; // HDMA5 case 0xFF55: ret = HDMA_ctrl; break; // HDMA5
case 0xFF68: ret = BG_pal_ret; break; // BGPI case 0xFF68: ret = BG_pal_ret; break; // BGPI
case 0xFF69: ret = BG_bytes[BG_bytes_index]; break; // BGPD case 0xFF69: ret = BG_PAL_read(); break; // BGPD
case 0xFF6A: ret = OBJ_pal_ret; break; // OBPI case 0xFF6A: ret = OBJ_pal_ret; break; // OBPI
case 0xFF6B: ret = OBJ_bytes[OBJ_bytes_index]; break; // OBPD case 0xFF6B: ret = OBJ_bytes[OBJ_bytes_index]; break; // OBPD
} }
@ -90,6 +90,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
return ret; return ret;
} }
public byte BG_PAL_read()
{
if (VRAM_access_read)
{
return BG_bytes[BG_bytes_index];
}
else
{
return 0xFF;
}
}
public override void WriteReg(int addr, byte value) public override void WriteReg(int addr, byte value)
{ {
switch (addr) switch (addr)
@ -240,8 +252,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
BG_bytes_inc = ((value & 0x80) == 0x80); BG_bytes_inc = ((value & 0x80) == 0x80);
break; break;
case 0xFF69: // BGPD case 0xFF69: // BGPD
BG_transfer_byte = value; if (VRAM_access_write)
BG_bytes[BG_bytes_index] = value; {
BG_transfer_byte = value;
BG_bytes[BG_bytes_index] = value;
}
// change the appropriate palette color // change the appropriate palette color
color_compute_BG(); color_compute_BG();