From 47866bbe87760ff9fa8e1cccdbc4764ccd0338f4 Mon Sep 17 00:00:00 2001 From: neauoire Date: Sun, 28 Mar 2021 11:12:00 -0700 Subject: [PATCH] Ported the software to the new disk location --- build.sh | 2 +- projects/software/nasu.usm | 6 ++++-- projects/software/neralie.usm | 3 ++- projects/software/noodle.usm | 4 +++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index a6e2477..a37af46 100755 --- a/build.sh +++ b/build.sh @@ -28,7 +28,7 @@ else fi echo "Assembling.." -./bin/assembler projects/software/left.usm bin/boot.rom +./bin/assembler projects/software/neralie.usm bin/boot.rom echo "Running.." if [ "${2}" = '--cli' ]; diff --git a/projects/software/nasu.usm b/projects/software/nasu.usm index 9a64ed0..21c5a9d 100644 --- a/projects/software/nasu.usm +++ b/projects/software/nasu.usm @@ -37,7 +37,7 @@ |0140 ;Keys { key 1 } |0150 ;Mouse { x 2 y 2 state 1 chord 1 change 1 } |0160 ;File { pad 8 name 2 length 2 load 2 save 2 } -|01F8 [ e0fc 30cc 30ac ] ( palette ) +|01F0 ;System { pad 8 r 2 g 2 b 2 } |0200 ,RESET JMP2 |0204 ,ERROR JMP2 @@ -46,7 +46,9 @@ ( program ) @RESET - + + ( theme ) #e0fc =System.r #30cc =System.g #30ac =System.b + ~Screen.width 2/ #008a SUB2 =bankview.x ~Screen.height 2/ #003f SUB2 =bankview.y ,bank =bankview.addr diff --git a/projects/software/neralie.usm b/projects/software/neralie.usm index 146e779..685a0a0 100644 --- a/projects/software/neralie.usm +++ b/projects/software/neralie.usm @@ -15,13 +15,14 @@ |0110 ;Screen { width 2 height 2 pad 4 x 2 y 2 color 1 } |0120 ;Sprite { pad 8 x 2 y 2 addr 2 color 1 } |0190 ;DateTime { year 2 month 1 day 1 hour 1 minute 1 second 1 dow 1 doy 2 isdst 1 pad 4 get 1 } -|01F8 [ 13fd 1ef3 1bf2 ] ( palette ) +|01F0 ;System { pad 8 r 2 g 2 b 2 } |0200 ,RESET JMP2 |0204 ,ERROR JMP2 |0208 ,FRAME JMP2 @RESET + ( theme ) #13fd =System.r #1ef3 =System.g #1bf2 =System.b #01 =fps.current #000c diff --git a/projects/software/noodle.usm b/projects/software/noodle.usm index 42cba8d..d96af9e 100644 --- a/projects/software/noodle.usm +++ b/projects/software/noodle.usm @@ -56,7 +56,7 @@ |0140 ;Keys { key 1 } |0150 ;Mouse { x 2 y 2 state 1 chord 1 } |0160 ;File { pad 8 name 2 length 2 load 2 save 2 } -|01F8 [ e0fd 30fd 30fd ] ( palette ) +|01F0 ;System { pad 8 r 2 g 2 b 2 } |0200 ,RESET JMP2 |0204 ,ERROR JMP2 @@ -66,6 +66,8 @@ @RESET + ( theme ) #e0fd =System.r #30fd =System.g #30fd =System.b + ( default canvas ) #002a =canvas.w #001a =canvas.h