Started porting examples to new vectors

This commit is contained in:
neauoire 2021-04-05 11:58:26 -07:00
parent 3d8ddc143a
commit 4c370d96d1
5 changed files with 27 additions and 29 deletions

View File

@ -28,7 +28,7 @@ else
fi fi
echo "Assembling.." echo "Assembling.."
./bin/assembler projects/software/left.usm bin/boot.rom ./bin/assembler projects/examples/dev.controller.usm bin/boot.rom
echo "Running.." echo "Running.."
if [ "${2}" = '--cli' ]; if [ "${2}" = '--cli' ];

View File

@ -22,25 +22,22 @@
( devices ) ( devices )
|0100 ;Console { pad 8 char 1 byte 1 short 2 string 2 } |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
|0110 ;Screen { width 2 height 2 pad 4 x 2 y 2 color 1 } |0110 ;Console { pad 8 char 1 byte 1 short 2 }
|0120 ;Sprite { pad 8 x 2 y 2 addr 2 color 1 } |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 color 1 }
|0130 ;Controller { p1 1 } |0130 ;Sprite { pad 8 x 2 y 2 addr 2 color 1 }
|0140 ;Keys { key 1 } |0140 ;Controller { buttons 1 }
|0150 ;Mouse { x 2 y 2 state 1 chord 1 } |0150 ;Keys { key 1 }
|0160 ;File { pad 8 name 2 length 2 load 2 save 2 } |0160 ;Mouse { x 2 y 2 state 1 chord 1 change 1 }
|0170 ;Audio { ch1adsr 2 ch2adsr 2 ch3adsr 2 ch4adsr 2 ch1vol 1 ch1pitch 1 ch2vol 1 ch2pitch 1 ch3vol 1 ch3pitch 1 ch4vol 1 ch4pitch 1 } |0170 ;File { pad 8 name 2 length 2 load 2 save 2 }
|01F0 ;System { pad 8 r 2 g 2 b 2 } |0180 ;Audio { ch1adsr 2 ch2adsr 2 ch3adsr 2 ch4adsr 2 ch1vol 1 ch1pitch 1 ch2vol 1 ch2pitch 1 ch3vol 1 ch3pitch 1 ch4vol 1 ch4pitch 1 }
( vectors ) ( vectors )
|0200 ^RESET JMP |0200 @RESET
|0204 ,ERROR JMP2
|0208 ,FRAME JMP2
@RESET
( theme ) #e0fa =System.r #30fa =System.g #30fa =System.b ( theme ) #e0fa =System.r #30fa =System.g #30fa =System.b
( vectors ) ,FRAME =Screen.vector
~Screen.width #0002 DIV2 DUP2 #0080 SUB2 =trkframe.x1 ~Screen.width #0002 DIV2 DUP2 #0080 SUB2 =trkframe.x1
#0080 ADD2 =trkframe.x2 #0080 ADD2 =trkframe.x2

View File

@ -4,14 +4,12 @@
( devices ) ( devices )
|0100 ;Console { pad 8 char 1 byte 1 short 2 } |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
|0200 ^RESET JMP |0110 ;Console { vector 2 pad 6 char 1 byte 1 short 2 }
|0204 ,ERROR JMP2
|0208 ,FRAME JMP2
( program ) ( program )
@RESET |0200 @RESET
,text1 ,print-label JSR2 ,text1 ,print-label JSR2
,text2 ,print-label JSR2 ,text2 ,print-label JSR2

View File

@ -10,18 +10,20 @@
( devices ) ( devices )
|0100 ;Console { pad 8 char 1 byte 1 short 2 } |0100 ;System { vector 2 pad 6 r 2 g 2 b 2 }
|0110 ;Screen { width 2 height 2 pad 4 y 2 x 2 color 1 } |0110 ;Console { pad 8 char 1 byte 1 short 2 }
|0120 ;Sprite { pad 8 x 2 y 2 addr 2 color 1 } |0120 ;Screen { vector 2 width 2 height 2 pad 2 x 2 y 2 color 1 }
|0130 ;Controller { p1 1 } |0130 ;Sprite { pad 8 x 2 y 2 addr 2 color 1 }
|01F0 ;System { pad 8 r 2 g 2 b 2 } |0140 ;Controller { p1 1 }
|0200 ^RESET JMP |0150 ;Keys { key 1 }
|0204 ,ERROR JMP2 |0160 ;Mouse { x 2 y 2 state 1 chord 1 change 1 }
|0208 ,FRAME JMP2 |0170 ;File { pad 8 name 2 length 2 load 2 save 2 }
|0180 ;Audio { ch1adsr 2 ch2adsr 2 ch3adsr 2 ch4adsr 2 ch1vol 1 ch1pitch 1 ch2vol 1 ch2pitch 1 ch3vol 1 ch3pitch 1 ch4vol 1 ch4pitch 1 }
@RESET |0200 @RESET
( theme ) #0daf =System.r #02ff =System.g #035f =System.b ( theme ) #0daf =System.r #02ff =System.g #035f =System.b
( vectors ) ,FRAME =Screen.vector
( set origin ) ( set origin )
~Screen.width 2/ =Sprite.x ~Screen.width 2/ =Sprite.x

View File

@ -45,6 +45,7 @@
|0200 @RESET |0200 @RESET
( theme ) #e0fc =System.r #30cc =System.g #30ac =System.b ( theme ) #e0fc =System.r #30cc =System.g #30ac =System.b
( vectors ) ,FRAME =Screen.vector
,FRAME =Screen.vector ,FRAME =Screen.vector