2 files changed, 15 insertions(+), 16 deletions(-)

M src/manifest.tal
M src/nasu.tal

@@ 376,14 376,13 @@ JMP2r
 
 	;&path .File/name DEO2
 	#0002 .File/length DEO2
-	;&r .File/load DEO2
-	;&g .File/load DEO2
-	;&b .File/load DEO2
-	.File/success DEI2 AND ,&skip JCN
-		LIT2 &r $2 .System/r DEO2
-		LIT2 &g $2 .System/g DEO2
-		LIT2 &b $2 .System/b DEO2
-		&skip
+	;&r .File/read DEO2
+	;&g .File/read DEO2
+	;&b .File/read DEO2
+	.File/success DEI2 ORA #01 JCN JMP2r
+	LIT2 &r $2 .System/r DEO2
+	LIT2 &g $2 .System/g DEO2
+	LIT2 &b $2 .System/b DEO2
 
 JMP2r
 	&path ".theme $1

@@ 5,7 5,7 @@
 |20 @Screen &vector $2 &width $2 &height $2 &auto $1 &pad $1 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1
 |80 @Controller &vector $2 &button $1 &key $1
 |90 @Mouse &vector $2 &x $2 &y $2 &state $1 &chord $1
-|a0 @File &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2
+|a0 @File &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &read $2 &write $2
 
 |0000
 


@@ 1058,12 1058,12 @@ JMP2r
 	( spritesheet )
 	;filepath .File/name DEO2
 	#1000 .File/length DEO2
-	;spritesheet .File/load DEO2
+	;spritesheet .File/read DEO2
 	( nametable )
 	;nametable-ext ;filepath ;scap JSR2 #0004 ;mcpy JSR2
 	;filepath .File/name DEO2
 	#0200 .File/length DEO2
-	;spritesheet/nametable .File/load DEO2
+	;spritesheet/nametable .File/read DEO2
 	;filepath ;scap JSR2 #0004 SUB2 #0004 ;mclr JSR2
 
 	#00 .state/changed STZ ;draw-state JSR2


@@ 1076,14 1076,14 @@ JMP2r
 	( spritesheet )
 	;filepath .File/name DEO2
 	#1000 .File/length DEO2
-	;spritesheet .File/save DEO2
+	;spritesheet .File/write DEO2
 
 	( nametable )
 	;has-nametable JSR2 #00 EQU ,&no-nametable JCN
 		;nametable-ext ;filepath ;scap JSR2 #0004 ;mcpy JSR2
 		;filepath .File/name DEO2
 		#0200 .File/length DEO2
-		;spritesheet/nametable .File/save DEO2
+		;spritesheet/nametable .File/write DEO2
 		;filepath ;scap JSR2 #0004 SUB2 #0004 ;mclr JSR2
 		&no-nametable
 


@@ 1098,7 1098,7 @@ JMP2r
 	.System/b DEI2 #fffe STA2
 	;load-theme/path .File/name DEO2
 	#0006 .File/length DEO2
-	#fffa .File/save DEO2
+	#fffa .File/write DEO2
 
 JMP2r
 


@@ 1115,7 1115,7 @@ JMP2r
 		.selection/x2 LDZ INC .selection/x1 LDZ
 		&hor
 			OVR2 NIP OVR SWP ;get-tile-addr JSR2 ;&buf #0010 ;mcpy JSR2
-			;&buf .File/save DEO2
+			;&buf .File/write DEO2
 			INC GTHk ,&hor JCN
 		POP2
 		INC GTHk ,&ver JCN


@@ 1133,7 1133,7 @@ JMP2r
 	&ver
 		.selection/x2 LDZ INC .selection/x1 LDZ
 		&hor
-			OVR2 NIP OVR SWP ;get-tile-addr JSR2 .File/load DEO2
+			OVR2 NIP OVR SWP ;get-tile-addr JSR2 .File/read DEO2
 			INC GTHk ,&hor JCN
 		POP2
 		INC GTHk ,&ver JCN