M Makefile → Makefile

@@ -1,21 +1,28 @@
 SRC = tictactoe.tal
 
-OBJ = $(SRC:.tal=.rom)
+PROG = $(SRC:.tal=.rom)
 
-CLEANFILES = $(OBJ)
+CLEANFILES = $(PROG)
 
-UXNASM = uxncli ~/roms/drifblim.rom
+UXNASM = uxncli ~/roms/asma.rom
+# UXNASM = uxncli ~/roms/drifblim.rom
 # UXNASM = uxnasm
 
-all: $(OBJ)
+UXNEMU = uxnemu
+# UXNEMU = uxn11
+
+all: $(PROG)
 
 .tal.rom:
 	$(UXNASM) $< $@
 
-$(OBJ): $(SRC)
+$(PROG): $(SRC)
 
-run: $(OBJ)
-	uxnemu -s 3 $<
+run: $(PROG)
+	$(UXNEMU) $<
+
+lint: $(SRC)
+	uxncli ~/roms/uxnlin.rom $<
 
 clean:
 	rm -f $(CLEANFILES)

M tictactoe.tal → tictactoe.tal

@@ -268,7 +268,6 @@ POP
     ;o .Screen/addr DEO2
     #03 .Screen/sprite DEO
     #01 .game/current-player STZ ( very evil )
-  JMP2r
 JMP2r
 
 @draw-endgame ( winstate -- )
@@ -300,10 +299,10 @@
 @pos-to-xy ( pos -- x* y* )
   #04 SFTk NIP
   #03 AND
-  #01 ADD #00 SWP #0010 MUL2
+  INC #00 SWP #40 SFT2
   ROT
   #03 AND
-  #01 ADD #00 SWP #0010 MUL2
+  INC #00 SWP #40 SFT2
 JMP2r
 
 @pos-to-addr ( pos -- addr )