@@ -28,7 +28,7 @@ else

 fi

 echo "Assembling.."

-./bin/assembler projects/software/noodle.usm bin/boot.rom

+./bin/assembler projects/software/nasu.usm bin/boot.rom

 echo "Running.."

 if [ "${2}" = '--cli' ]; 

@@ -34,10 +34,10 @@

 |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }

 |0110 ;Console { pad 8 char 1 byte 1 short 2 }

 |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 color 1 }

-|0130 ;Sprite { pad 8 x 2 y 2 addr 2 color 1 }

-|0140 ;Controller { buttons 1 }

-|0150 ;Keys { key 1 }

-|0160 ;Mouse { x 2 y 2 state 1 chord 1 change 1 }

+|0130 ;Sprite { vector 2 pad 6 x 2 y 2 addr 2 color 1 }

+|0140 ;Controller { vector 2 button 1 }

+|0150 ;Keys { vector 2 key 1 }

+|0160 ;Mouse  { vector 2 x 2 y 2 state 1 chord 1 }

 |0170 ;File { pad 8 name 2 length 2 load 2 save 2 }

 ( program )

@@ -67,19 +67,19 @@ BRK

 	( keyboard controls )

-	~Keys #00 EQU ^$no-key JNZ

+	~Keys.key #00 EQU ^$no-key JNZ

-		~Keys #31 LTH ^$no-key JNZ

-		~Keys #33 GTH ^$no-key JNZ

-		( select ) ~Keys #31 SUB =bankview.mode

-		( release ) #00 =Keys

+		~Keys.key #31 LTH ^$no-key JNZ

+		~Keys.key #33 GTH ^$no-key JNZ

+		( select ) ~Keys.key #31 SUB =bankview.mode

+		( release ) #00 =Keys.key

 		,redraw JSR2 

 	$no-key

-	~Controller.buttons #00 EQU ^$no-ctrl JNZ

+	~Controller.button #00 EQU ^$no-ctrl JNZ

-		~Controller.buttons

+		~Controller.button

 		DUP #10 EQU ^$no-ctrl-up JNZ

 			~tileview.addr #0080 ADD2 =tileview.addr $no-ctrl-up

 		DUP #20 EQU ^$no-ctrl-down JNZ