2 files changed, 10 insertions(+), 4 deletions(-)

M build.sh
M src/donsol.tal

@@ 4,6 4,12 @@ echo "Cleaning.."
 rm -rf bin
 mkdir bin
 
+if [ -e "$HOME/roms/uxnlin.rom" ]
+then
+	echo "Linting.."
+	uxncli $HOME/roms/uxnlin.rom src/donsol.tal
+fi
+
 echo "Assembling.."
 uxnasm src/donsol.tal bin/donsol.rom 
 

@@ 129,7 129,7 @@ BRK
 	#0320 #0000
 	&loop
 		( x ) DUP2 #0020 ( mod ) DIV2k MUL2 SUB2 #30 SFT2 .frame/x LDZ2 ADD2 #0010 SUB2 .Screen/x DEO2
-		( y ) DUP2 #0020 DIV2 #30 SFT2 .frame/y LDZ2 ADD2 #0040 SUB2 .Screen/y DEO2
+		( y ) DUP2 #05 SFT2 #30 SFT2 .frame/y LDZ2 ADD2 #0040 SUB2 .Screen/y DEO2
 		( addr ) DUP2 ;splash-table ADD2 LDA #40 SUB #00 SWP #40 SFT2 ;spritesheet ADD2 .Screen/addr DEO2
 		( draw ) #81 .Screen/sprite DEO
 		INC2 GTH2k ,&loop JCN


@@ 353,7 353,7 @@ JMP2r
 
 	#3600
 	&loop
-		DUP DUP .deck/cards ADD STZ
+		DUPk .deck/cards ADD STZ
 		INC GTHk ,&loop JCN
 	POP2
 	#36 .deck/length STZ


@@ 450,7 450,7 @@ JMP2r
 		JMP2r
 
 	&shielding ( value -- )
-		( test breaking ) DUP INC .player/dp LDZ GTH ,&breaking JCN
+		( test breaking ) INCk .player/dp LDZ GTH ,&breaking JCN
 		( test blocking ) DUP .player/sp LDZ LTH ,&blocking JCN
 		( durability ) DUP .player/dp STZ
 		( damages ) .player/sp LDZ SUB ;take-damages JSR2


@@ 726,7 726,7 @@ JMP2r
 	.frame/y LDZ2 #0020 ADD2
 		.table .table/selection LDZ ADD LDZ
 		#00 SWP #10 SFT2 ;card-names ADD2 LDA2
-		STHkr #02 MUL
+		STHkr #10 SFT
 		;draw-label JSR2
 
 	.frame/x LDZ2 #0014 ADD2 [ .table/selection LDZ #00 SWP #0038 MUL2 ADD2 ] .Screen/x DEO2