5 files changed, 34 insertions(+), 29 deletions(-)

M build.sh
M src/assets.tal
M src/library.tal
M src/manifest.tal
M src/orca.tal

@@ 1,32 1,36 @@
 #!/bin/sh -e
 
-echo "Cleaning.."
+# ~/Applications/butler push bin/orca.rom hundredrabbits/orca:uxn
+
+ASM="uxncli $HOME/roms/drifblim.rom"
+EMU="uxnemu"
+LIN="uxncli $HOME/roms/uxnlin.rom"
+
+SRC="src/orca.tal"
+DST="bin/orca.rom"
+
+CPY="$HOME/roms"
+ETC="src/manifest.tal src/library"
+ARG="etc/tests.orca"
+
+echo ">> Cleaning"
 rm -rf bin
 mkdir bin
 
-if [ -e "$HOME/roms/uxnlin.rom" ]
+if [[ "$*" == *"--lint"* ]]
 then
-	echo "Linting.."
-	uxncli $HOME/roms/uxnlin.rom src/orca.tal
-	uxncli $HOME/roms/uxnlin.rom src/library.tal
-	uxncli $HOME/roms/uxnlin.rom src/manifest.tal
+    echo ">> Linting $SRC"
+	$LIN $SRC $ETC
 fi
 
-echo "Assembling.."
-uxnasm src/orca.tal bin/orca.rom 
-
-echo "Installing.."
-if [ -d "$HOME/roms" ] && [ -e ./bin/orca.rom ]
-then
-	cp ./bin/orca.rom $HOME/roms
-	echo "Installed in $HOME/roms"
-fi
+echo ">> Assembling $SRC"
+$ASM $SRC $DST
 
-if [ "${1}" = '--push' ]; 
+if [[ "$*" == *"--save"* ]]
 then
-	echo "Pushing.."
-	~/Applications/butler push bin/orca.rom hundredrabbits/orca:uxn
+    echo ">> Saving $DST"
+	cp $DST $CPY
 fi
 
-echo "Running.."
-uxnemu bin/orca.rom etc/tests.orca
+echo ">> Running $DST"
+$EMU $DST $ARG

@@ 336,3 336,9 @@
 	( 7D	} ) :op-null
 	( 7E	~ ) :op-null
 	( 7F	_ ) :op-null
+
+@data
+	&cells $4000
+	&locks $4000
+	&types $4000
+

@@ 577,3 577,5 @@ JMP2r
 
 JMP2r
 
+~src/manifest.tal
+

@@ 363,9 363,9 @@ JMP2r
 
 JMP2r
 
-( assets )
-
 @hand-icn
 	2020 20b8 7c7c 3838
 @blank-icn
 	0000 0000 0000 0000
+
+~src/assets.tal

@@ 1102,11 1102,4 @@ JMP2r
 @untitled-txt "untitled.orca $1
 
 ~src/library.tal
-~src/assets.tal
-~src/manifest.tal
-
-@data
-	&cells $4000
-	&locks $4000
-	&types $4000