diff --git a/build.sh b/build.sh index 911c561..063b502 100755 --- a/build.sh +++ b/build.sh @@ -1,41 +1,35 @@ #!/bin/sh -e +ID="nasu" ASM="uxncli $HOME/roms/drifblim.rom" EMU="uxnemu" LIN="uxncli $HOME/roms/uxnlin.rom" APP="$HOME/bin/butler push" - -SRC="src/nasu.tal" -DST="bin/nasu.rom" +SRC="src/${ID}.tal" +DST="bin/${ID}.rom" CPY="$HOME/roms" ARG="" APPID="hundredrabbits/nasu:uxn" -echo ">> Cleaning" rm -rf bin mkdir bin if [[ "$*" == *"--lint"* ]] then - echo ">> Linting $SRC" $LIN $SRC fi -echo ">> Assembling $SRC" $ASM $SRC $DST if [[ "$*" == *"--save"* ]] then - echo ">> Saving $DST" cp $DST $CPY fi if [[ "$*" == *"--push"* ]] then - echo ">> Pushing $DST" $APP $DST $APPID fi -echo ">> Running $DST" $EMU $DST $ARG diff --git a/src/assets.tal b/src/assets.tal index d07b27c..08f64b0 100644 --- a/src/assets.tal +++ b/src/assets.tal @@ -1,5 +1,3 @@ -@fill-icn - ffff ffff ffff ffff @bigpixel-icn f0f0 f0f0 0000 0000 @halftone-icn diff --git a/src/manifest.tal b/src/manifest.tal index 77d25bc..c45bf64 100644 --- a/src/manifest.tal +++ b/src/manifest.tal @@ -260,7 +260,7 @@ JMP2r .Screen/y DEI2 .Screen/auto DEI #f2 .Screen/auto DEO - ;blank-icn .Screen/addr DEO2 + ;fill-icn ;blank-icn ;draw-chr/color LDA #00 EQU [ JMP SWP2 POP2 ] .Screen/addr DEO2 ;draw-chr/color LDA .Screen/sprite DEO .Screen/auto DEO .Screen/y DEO2 @@ -309,6 +309,7 @@ JMP2r @update-cursor ( color addr* -- ) #00 .Screen/auto DEO + ;fill-icn .Screen/addr DEO2 #40 draw-cursor .Mouse/x DEI2 DUP2 .cursor/x STZ2 .Screen/x DEO2 .Mouse/y DEI2 DUP2 .cursor/y STZ2 .Screen/y DEO2 @@ -446,5 +447,7 @@ JMP2r 2020 20b8 7c7c 3838 ] @blank-icn [ 0000 0000 0000 0000 ] +@fill-icn [ + ffff ffff ffff ffff ] ~src/assets.tal