6502
/
8bitworkshop
mirror of https://github.com/sehugg/8bitworkshop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:sehugg/8bitworkshop

This commit is contained in:
Steven Hugg 2020-06-03 18:38:24 -05:00
parent 8c20b43ed9 c3b2c60d16
commit 58b6f0f922
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
presets/verilog/switches.v
View File

@ -5,7 +5,7 @@
Switch test program.
Player 1 Keys: arrow keys + space + shift
Player 2 Keys: A/D/W/S + Z + X
Player 2 Keys: A/D/W/S + T + R
*/
module switches_top(clk, reset, hsync, vsync,
switches_p1, switches_p2,

6
src/machine/apple2.ts
View File

@ -403,7 +403,7 @@ var Apple2Display = function(pixels : Uint32Array, apple : AppleGRParams) {
RGBA(0, 163, 96),
RGBA(156, 156, 156),
RGBA(20, 207, 253),
RGBA(128, 128, 255),
RGBA(208, 195, 255),
RGBA(96, 114, 3),
RGBA(255, 106, 60),
RGBA(156, 156, 156),
@ -471,10 +471,10 @@ var Apple2Display = function(pixels : Uint32Array, apple : AppleGRParams) {
// see if the hi bit is set
if ((b1 & 0x80) == 0)
{
c1 = 1; c2 = 12; // red & green
c1 = 3; c2 = 12; // purple & green
} else
{
c1 = 7; c2 = 9; // blue & orange
c1 = 6; c2 = 9; // blue & orange
}
// make a value consisting of:
// the 8th bit, then bits 0-7, then the 9th bit

12
src/platform/verilog.ts
View File

@ -47,12 +47,12 @@ var VERILOG_KEYCODE_MAP = makeKeycodeMap([
[Keys.DOWN, 0, 0x8],
[Keys.A, 0, 0x10],
[Keys.B, 0, 0x20],
[Keys.P2_LEFT, 0, 0x1],
[Keys.P2_RIGHT, 0, 0x2],
[Keys.P2_UP, 0, 0x4],
[Keys.P2_DOWN, 0, 0x8],
[Keys.P2_A, 0, 0x10],
[Keys.P2_B, 0, 0x20],
[Keys.P2_LEFT, 1, 0x1],
[Keys.P2_RIGHT, 1, 0x2],
[Keys.P2_UP, 1, 0x4],
[Keys.P2_DOWN, 1, 0x8],
[Keys.P2_A, 1, 0x10],
[Keys.P2_B, 1, 0x20],
[Keys.START, 2, 0x1],
[Keys.P2_START, 2, 0x2],
[Keys.SELECT, 2, 0x4],