etc
/
uxn
mirror of https://git.sr.ht/~rabbits/uxn
0
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'main' of git.sr.ht:~rabbits/uxn

This commit is contained in:
Devine Lu Linvega 2023-03-01 11:31:10 -08:00
parent dae025af20 075747f2bd
commit 96a19b4887
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/screen.c
View File

@ -16,7 +16,7 @@ WITH REGARD TO THIS SOFTWARE.
UxnScreen uxn_screen;
static Uint8 blending[5][16] = {
static Uint8 blending[4][16] = {
{0, 0, 0, 0, 1, 0, 1, 1, 2, 2, 0, 2, 3, 3, 3, 0},
{0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3},
{1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1, 1, 2, 3, 1},

2
src/uxn.c
View File

@ -49,7 +49,7 @@ uxn_eval(Uxn *u, Uint16 pc)
switch(opcode - (!opcode * (instr >> 5))) {
/* Immediate */
case -0x0: /* BRK */ return 1;
case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; }
case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; } /* else fallthrough */
case -0x2: /* JMI */ pc += PEEK16(u->ram + pc) + 2; break;
case -0x3: /* JSI */ s = u->rst; PUSH16(pc + 2) pc += PEEK16(u->ram + pc) + 2; break;
case -0x4: /* LIT */