[VM][MZ2500] Merge Upstream 2019-12-31.

diff --git a/source/history.txt b/source/history.txt
index 60b38ac..9598efd 100644 (file)
--- a/source/history.txt
+++ b/source/history.txt
@@ -1,3 +1,8 @@
+12/31/2019
+
+[MZ2500/CRTC] apply crtc patch (thanks Mr.Koucha-Youkan)
+
+
 11/3/2019
 
 [PC98RL] fix horizontal frequency

diff --git a/source/src/vm/mz2500/crtc.cpp b/source/src/vm/mz2500/crtc.cpp
index 6047ed3..303a3e4 100644 (file)
--- a/source/src/vm/mz2500/crtc.cpp
+++ b/source/src/vm/mz2500/crtc.cpp
@@ -966,10 +966,10 @@ void CRTC::draw_40column_screen()
                        uint32_t dest = 640 * y;
                        uint8_t col;
                        for(int x = 0; x < 640; x++) {
-                               if((text[src1] & 8) && (text[src2] & 8)) {
+                               // thanks Mr.Koucha-Youkan
+                               col = (((text[src1] & 7) << 3) | (text[src2] & 7)) + 16;
+                               if(col == 16 && ((text[src1] & 8) && (text[src2] & 8))) {
                                        col = 8; // non transparent black
-                               } else {
-                                       col = (((text[src1] & 7) << 3) | (text[src2] & 7)) + 16;
                                }
                                text[dest++] = col;
                                src1++;