diff --git a/src/emucore/CartMVC.cxx b/src/emucore/CartMVC.cxx index e24f6f245..6012413bf 100755 --- a/src/emucore/CartMVC.cxx +++ b/src/emucore/CartMVC.cxx @@ -538,205 +538,205 @@ static constexpr uInt8 volumeLabelOdd[] = { // Level bars // 8 rows * 5 columns = 40 static constexpr uInt8 levelBarsEvenData[] = { - /**/ + /*0*/ 0, 0, 0, 0, 0, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 2, 40, 161, 133, 20, - 20, 80, 66, 10, 32, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x41, 0x41, 0x41, 0x41, 0x41, + 0x41, 0x41, 0x41, 0x41, 0x41, + 0x41, 0x41, 0x41, 0x41, 0x41, + 0x41, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, - /**/ + /*1*/ 0, 0, 0, 0, 0, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 3, 40, 161, 133, 20, - 244, 80, 66, 10, 32, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x41, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x41, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, - /**/ + /*2*/ 0, 0, 0, 0, 0, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 3, 232, 161, 133, 20, - 247, 80, 66, 10, 32, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, - /**/ + /*3*/ 0, 0, 0, 0, 0, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 3, 239, 161, 133, 20, - 247, 208, 66, 10, 32, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, - /**/ + /*4*/ 0, 0, 0, 0, 0, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 3, 239, 161, 133, 20, - 247, 223, 66, 10, 32, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, - /**/ + /*5*/ 0, 0, 0, 0, 0, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 3, 239, 191, 133, 20, - 247, 223, 66, 10, 32, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, - /**/ + /*6*/ 0, 0, 0, 0, 0, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 3, 239, 191, 133, 20, - 247, 223, 126, 10, 32, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, - /**/ + /*7*/ 0, 0, 0, 0, 0, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 20, - 247, 223, 126, 10, 32, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, - /**/ + /*8*/ 0, 0, 0, 0, 0, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 20, - 247, 223, 126, 250, 32, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, - /**/ + /*9*/ 0, 0, 0, 0, 0, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 244, - 247, 223, 126, 251, 32, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, - /**/ + /*10*/ 0, 0, 0, 0, 0, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, }; static constexpr uInt8 levelBarsOddData[] = { - /**/ - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 20, 80, 66, 10, 32, - 2, 40, 161, 133, 20, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, + /*0*/ + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x41, 0x41, 0x41, 0x41, 0x41, + 0x41, 0x41, 0x41, 0x41, 0x41, + 0x41, 0x41, 0x41, 0x41, 0x41, + 0x41, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - /**/ - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 244, 80, 66, 10, 32, - 3, 40, 161, 133, 20, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, + /*1*/ + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x41, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x41, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - /**/ - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 247, 80, 66, 10, 32, - 3, 232, 161, 133, 20, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, + /*2*/ + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - /**/ - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 247, 208, 66, 10, 32, - 3, 239, 161, 133, 20, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, + /*3*/ + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x41, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - /**/ - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 247, 223, 66, 10, 32, - 3, 239, 161, 133, 20, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, + /*4*/ + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - /**/ - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 247, 223, 66, 10, 32, - 3, 239, 191, 133, 20, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, + /*5*/ + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x41, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - /**/ - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 247, 223, 126, 10, 32, - 3, 239, 191, 133, 20, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, + /*6*/ + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - /**/ - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 247, 223, 126, 10, 32, - 3, 239, 191, 253, 20, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, + /*7*/ + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x41, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - /**/ - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 247, 223, 126, 250, 32, - 3, 239, 191, 253, 20, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, + /*8*/ + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - /**/ - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 32, - 3, 239, 191, 253, 244, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, + /*9*/ + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x41, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - /**/ - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, - 247, 223, 126, 251, 224, - 3, 239, 191, 253, 247, + /*10*/ + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, + 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }; @@ -1355,6 +1355,20 @@ void MovieCart::runStateMachine() case 2: if(!myA7) { + if(myOdd) + { + if(myDrawTimeCode) + { + if (myLines == (TIMECODE_HEIGHT - 0)) + myStream.blankPartialLines(true); + } + if(myDrawLevelBars) + { + if(myLines == 22) + myStream.blankPartialLines(true); + } + } + if(myLines >= 1) { fill_addr_left_line(1); diff --git a/test/roms/bankswitching/MVC/20centuryfox.bin b/test/roms/bankswitching/MVC/20centuryfox.bin index 820241b3f..29c730081 100755 Binary files a/test/roms/bankswitching/MVC/20centuryfox.bin and b/test/roms/bankswitching/MVC/20centuryfox.bin differ diff --git a/test/roms/bankswitching/MVC/cronkite.bin b/test/roms/bankswitching/MVC/cronkite.bin index 12ee99f30..48d65ea1a 100755 Binary files a/test/roms/bankswitching/MVC/cronkite.bin and b/test/roms/bankswitching/MVC/cronkite.bin differ diff --git a/test/roms/bankswitching/MVC/dancer.bin b/test/roms/bankswitching/MVC/dancer.bin index 0df041e90..6bbe3ab6e 100755 Binary files a/test/roms/bankswitching/MVC/dancer.bin and b/test/roms/bankswitching/MVC/dancer.bin differ diff --git a/test/roms/bankswitching/MVC/lion.bin b/test/roms/bankswitching/MVC/lion.bin index 5b17f6b55..94d839b56 100755 Binary files a/test/roms/bankswitching/MVC/lion.bin and b/test/roms/bankswitching/MVC/lion.bin differ diff --git a/test/roms/bankswitching/MVC/street.bin b/test/roms/bankswitching/MVC/street.bin index c4354e3e1..6f19b4450 100755 Binary files a/test/roms/bankswitching/MVC/street.bin and b/test/roms/bankswitching/MVC/street.bin differ