Connected nametable parser to toolchain

build.sh

@@ -7,12 +7,14 @@ mkdir bin
 if [ -e "$HOME/roms/uxnlin.rom" ]
 then
 	echo "Linting.."
+	uxncli $HOME/roms/uxnlin.rom etc/nametable.tal
 	uxncli $HOME/roms/uxnlin.rom src/nasu.tal
 	uxncli $HOME/roms/uxnlin.rom src/manifest.tal
 fi
 
 echo "Assembling.."
-uxnasm src/nasu.tal bin/nasu.rom 
+uxnasm etc/nametable.tal bin/nametable.rom
+uxnasm src/nasu.tal bin/nasu.rom
 
 if [ -d "$HOME/roms" ] && [ -e ./bin/nasu.rom ]
 then
@@ -26,5 +28,9 @@ then
 	~/Applications/butler push bin/nasu.rom hundredrabbits/nasu:uxn
 fi
 
+cp ako10x10.chr bin/
+
+
 echo "Running.."
-uxnemu bin/nasu.rom ako10x10.chr
+uxncli bin/nametable.rom bin/ako10x10.chr
+uxn11 ~/roms/nasu.rom bin/ako10x10.chr

etc/nametable.tal

@@ -38,7 +38,6 @@ BRK
 	STH2r ;parse-chr JSR2
 
 	( export compressed spritesheet )
-	;&out-ext ;src ;scap JSR2 #0004 SUB2 ;scpy JSR2
 	;src .File2/name DEO2
 	.length LDZ2 .File2/length DEO2
 	;spritesheet .File2/write DEO2
@@ -48,7 +47,6 @@ BRK
 
 BRK
 	&nmt-ext ".nmt $1
-	&out-ext ".out.chr $1
 
 @parse-chr ( file* -- )
 

src/nasu.tal

@@ -728,10 +728,10 @@ JMP2r
 		.nametable/x LDZ2 .Screen/x DEO2
 		#1000
 		&hor
-			#00 OVR STHkr #40 SFT ADD 
-			DUP2 ;spritesheet/nametable ADD2 LDA 
-				#00 SWP #40 SFT2 ;spritesheet ADD2 .Screen/addr DEO2
-			;spritesheet/color ADD2 LDA .Screen/sprite DEO
+			( id ) #00 OVR STHkr #40 SFT ADD
+			( addr* ) #0003 MUL2 ;spritesheet/nametable ADD2
+				LDA2k ;spritesheet ADD2 .Screen/addr DEO2
+			( color ) INC2 INC2 LDA .Screen/sprite DEO
 			INC GTHk ,&hor JCN
 		POP2
 		POPr
@@ -1104,7 +1104,7 @@ JMP2r
 	( nametable )
 	;nametable-ext ;filepath ;scap JSR2 #0004 ;mcpy JSR2
 	;filepath .File/name DEO2
-	#0200 .File/length DEO2
+	#0300 .File/length DEO2
 	;spritesheet/nametable .File/read DEO2
 	;filepath ;scap JSR2 #0004 SUB2 #0004 ;mclr JSR2
 
@@ -1359,7 +1359,7 @@ JMP2r
 @ror ( byte -- byte ) DUP #70 SFT SWP #01 SFT ADD JMP2r
 
 @untitled-txt "untitled.chr $1
-@nametable-ext ".tbl $1
+@nametable-ext ".nmt $1
 
 @bigpixel-icn f0f0 f0f0 0000 0000
 @halftone-icn aa55 aa55 aa55 aa55
@@ -1391,6 +1391,7 @@ JMP2r
 ~src/manifest.tal
 
 |8000
-	@spritesheet $1000
+
+@spritesheet $1000
 	&nametable $100
 	&color