| ... | ... |
@@ -20,5 +20,5 @@ cc -std=c89 -DDEBUG -Wall -Wno-unknown-pragmas -Wpedantic -Wshadow -Wextra -Werr |
| 20 | 20 |
# cc uxn.c emulator.c -std=c89 -Os -DNDEBUG -g0 -s -Wall -Wno-unknown-pragmas -L/usr/local/lib -lSDL2 -o bin/emulator |
| 21 | 21 |
|
| 22 | 22 |
# run |
| 23 |
-./bin/assembler projects/software/noodle.usm bin/boot.rom |
|
| 23 |
+./bin/assembler projects/software/left.usm bin/boot.rom |
|
| 24 | 24 |
./bin/emulator bin/boot.rom |
| ... | ... |
@@ -3,7 +3,6 @@ |
| 3 | 3 |
%++ { #0001 ADD2 }
|
| 4 | 4 |
%-- { #0001 SUB2 }
|
| 5 | 5 |
%2/ { #0002 DIV2 }
|
| 6 |
-%JMC2 { ROT JMP2? POP2 }
|
|
| 7 | 6 |
|
| 8 | 7 |
;slime { color 1 }
|
| 9 | 8 |
|
| ... | ... |
@@ -27,21 +26,21 @@ BRK |
| 27 | 26 |
( hold ctrl key to change slime color ) |
| 28 | 27 |
|
| 29 | 28 |
~Controller.buttons #0f AND |
| 30 |
- DUP #01 NEQ ,$no-ctrl JMC2 #05 =slime $no-ctrl |
|
| 31 |
- DUP #02 NEQ ,$no-alt JMC2 #0f =slime $no-alt |
|
| 29 |
+ DUP #01 NEQ ,$no-ctrl ROT JMP2? #05 =slime $no-ctrl |
|
| 30 |
+ DUP #02 NEQ ,$no-alt ROT JMP2? #0f =slime $no-alt |
|
| 32 | 31 |
POP |
| 33 | 32 |
|
| 34 | 33 |
( clear ) #10 =Sprite.color |
| 35 | 34 |
|
| 36 | 35 |
( detect movement ) |
| 37 | 36 |
~Controller.buttons #f0 AND |
| 38 |
- DUP #04 SHR #01 AND #01 NEQ ,$no-up JMC2 |
|
| 37 |
+ DUP #04 SHR #01 AND #01 NEQ ,$no-up ROT JMP2? |
|
| 39 | 38 |
( move ) ~Sprite.y -- =Sprite.y ,up_icn =Sprite.addr $no-up |
| 40 |
- DUP #05 SHR #01 AND #01 NEQ ,$no-down JMC2 |
|
| 39 |
+ DUP #05 SHR #01 AND #01 NEQ ,$no-down ROT JMP2? |
|
| 41 | 40 |
( move ) ~Sprite.y ++ =Sprite.y ,down_icn =Sprite.addr $no-down |
| 42 |
- DUP #06 SHR #01 AND #01 NEQ ,$no-left JMC2 |
|
| 41 |
+ DUP #06 SHR #01 AND #01 NEQ ,$no-left ROT JMP2? |
|
| 43 | 42 |
( move ) ~Sprite.x -- =Sprite.x ,left_icn =Sprite.addr $no-left |
| 44 |
- DUP #07 SHR #01 AND #01 NEQ ,$no-right JMC2 |
|
| 43 |
+ DUP #07 SHR #01 AND #01 NEQ ,$no-right ROT JMP2? |
|
| 45 | 44 |
( move ) ~Sprite.x ++ =Sprite.x ,right_icn =Sprite.addr $no-right |
| 46 | 45 |
POP |
| 47 | 46 |
|
| ... | ... |
@@ -47,7 +47,7 @@ BRK |
| 47 | 47 |
|
| 48 | 48 |
( load ) ~editor.addr ~Mouse.y ~editor.y1 SUB2 #0008 DIV2 ADD2 LDR |
| 49 | 49 |
( mask ) #01 #07 ~Mouse.x ~editor.x1 SUB2 #0008 DIV2 SWP POP SUB SHL |
| 50 |
- XOR |
|
| 50 |
+ ORA |
|
| 51 | 51 |
( save ) ~editor.addr ~Mouse.y ~editor.y1 SUB2 #0008 DIV2 ADD2 STR |
| 52 | 52 |
|
| 53 | 53 |
,draw-window JSR2 |