6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-26 09:29:45 +00:00
Code Issues Projects Releases Wiki Activity

Corrects colour fetching for multicolour text mode.

Browse Source
This commit is contained in:
Thomas Harte 2018-10-18 20:38:00 -04:00
parent 8ff265c3a1
commit da00c832f5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Components/9918/9918.cpp
View File

@ -489,7 +489,7 @@ void TMS9918::set_register(int address, uint8_t value) {
break; break;
case 3: case 3:
colour_table_address_ = size_t(low_write_ << 6) | 0x1f; colour_table_address_ = size_t(low_write_ << 6) | 0x3f;
break; break;
case 4: case 4:

6
Components/9918/Implementation/9918Base.hpp
View File

@ -530,8 +530,8 @@ class Base {
#define fetch_tile_name(column) line_buffer.names[column].offset = ram_[(row_base + column) & 0x3fff]; #define fetch_tile_name(column) line_buffer.names[column].offset = ram_[(row_base + column) & 0x3fff];
#define fetch_tile(column) {\ #define fetch_tile(column) {\
line_buffer.patterns[column][1] = ram_[(colour_base + static_cast<size_t>((line_buffer.names[column].offset << 3) >> colour_name_shift)) & 0x3fff]; \ line_buffer.patterns[column][1] = ram_[(colour_base + size_t((line_buffer.names[column].offset << 3) >> colour_name_shift)) & 0x3fff]; \
line_buffer.patterns[column][0] = ram_[(pattern_base + static_cast<size_t>(line_buffer.names[column].offset << 3)) & 0x3fff]; \ line_buffer.patterns[column][0] = ram_[(pattern_base + size_t(line_buffer.names[column].offset << 3)) & 0x3fff]; \
} }
#define background_fetch_block(location, column, sprite) \ #define background_fetch_block(location, column, sprite) \
@ -568,7 +568,7 @@ class Base {
colour_base += size_t(write_pointer_.row & 7); colour_base += size_t(write_pointer_.row & 7);
colour_name_shift = 0; colour_name_shift = 0;
} else { } else {
colour_base &= size_t(0xffc0 | (write_pointer_.row & 7)); colour_base &= size_t(0xffc0);
pattern_base &= size_t(0x3800); pattern_base &= size_t(0x3800);
} }