Merge commit 'b1f8a29504de91ce4509d2c96f28ff29f85c97c8' into dev

This commit is contained in:
Simone
2025-01-07 15:07:26 +00:00
3 changed files with 54058 additions and 48976 deletions

View File

@@ -1 +1 @@
1f69c762be68feb9fcd5276d75acc6e5a6160a19 1cecd042b2619bc505c12bfdc713808386f2b54d

View File

@@ -202,9 +202,10 @@ void store_vram_color(uint index, uint slice)
{ {
index &= RDRAM_MASK_8; index &= RDRAM_MASK_8;
index += slice * RDRAM_SIZE; index += slice * RDRAM_SIZE;
vram8.data[index ^ 3u] = mem_u8(current_color.r); uint col = (index & 1) != 0 ? current_color.g : current_color.r;
vram8.data[index ^ 3u] = mem_u8(col);
if ((index & 1u) != 0u) if ((index & 1u) != 0u)
hidden_vram.data[index >> 1u] = mem_u8((current_color.r & 1) * 3); hidden_vram.data[index >> 1u] = mem_u8((col & 1) * 3);
break; break;
} }