5 files changed, 4 insertions(+), 3 deletions(-)

M .hgignore
R roms/asteroid.rom => 
R roms/draw.rom => 
R roms/snake.rom => 
M src/tnyemu.c
M .hgignore +1 -0
@@ 1,1 1,2 @@ 
 bin
+roms

          
R roms/asteroid.rom =>  +0 -0

R roms/draw.rom =>  +0 -0

R roms/snake.rom =>  +0 -0

M src/tnyemu.c +3 -3
@@ 86,7 86,7 @@ int eval(Tny *t, Uint8 ip)
 		case 0x20: /* AND */ POPr1 POPr2 PUSH(ps, r1 & r2) break;
 		case 0x21: /* ORR */ POPr1 POPr2 PUSH(ps, r1 | r2) break;
 		case 0x22: /* XOR */ POPr1 POPr2 PUSH(ps, r1 ^ r2) break;
-		case 0x23: /* SFT */ POPr1 POPr2 PUSH(ps, (r2 >> r1&0x0f) << ((r1&0xf0) >> 4)) break;
+		case 0x23: /* SFT */ POPr1 POPr2 PUSH(ps, (r2 >> (r1&0x0f)) << ((r1&0xf0) >> 4)) break;
 		case 0x24: /* CLS */ for (r1 = 0; r1 < 32; r1++) scn[r1] = 0; break;
 		case 0x25: /* SET */ POPr1 POPr2 !r1? (scn[r2 / 8] &= ~(128 >> r2 % 8)) : (scn[r2 / 8] |= (128 >> r2 % 8)); break;
 		case 0x26: /* GET */ POPr1 PUSH(ps, scn[r1 / 8] & (128 >> r1 % 8) ? 1 : 0) break;

          
@@ 196,8 196,8 @@ void x_loop(Tny *t)
 				case XK_Down: controller ^= 0x02; break;
 				case XK_Left: controller ^= 0x04; break;
 				case XK_Right: controller ^= 0x08; break;
-				case XK_c: controller ^= 0x10; break;
-				case XK_x: controller ^= 0x20; break;
+				case XK_x: controller ^= 0x10; break;
+				case XK_c: controller ^= 0x20; break;
 				}
 				if (event.type == KeyPress) {
 					if (t->ram[1]) {