Match manifest with routine names

src/manifest.tal

@@ -15,25 +15,23 @@
 			10 'v :edit-paste "Paste $1
 			10 'x :edit-cut "Cut $1
 		03 "Select $1
-			00 'q :select-tool1 "Brush $1
-			00 'w :select-tool2 "Selector $1
-			00 'e :select-tool2 "Zoom $1
+			00 'q :select-brush "Brush $1
+			00 'w :select-selector "Selector $1
+			00 'e :select-zoom "Zoom $1
+			01 00 :select-up "Up $1
+			02 00 :select-down "Down $1
+			04 00 :select-left "Left $1
+			08 00 :select-right "Right $1
+			41 00 :select-dech "Decr.Height $1
+			42 00 :select-inch "Incr.Height $1
+			44 00 :select-decw "Decr.Width $1
+			48 00 :select-incw "Incr.Width $1
 		04 "Pick $1
-			00 '1 :pick-1 "Color1 $1
-			00 '2 :pick-2 "Color2 $1
-			00 '3 :pick-3 "Color3 $1
-			00 '4 :pick-4 "Color4 $1
-		08 "Move $1
-			01 00 :move-up "Up $1
-			02 00 :move-down "Down $1
-			04 00 :move-left "Left $1
-			08 00 :move-right "Right $1
-			41 00 :scale-up "Decr.Height $1
-			42 00 :scale-down "Incr.Height $1
-			44 00 :scale-left "Decr.Width $1
-			48 00 :scale-right "Incr.Width $1
+			00 '1 :pick-color1 "Color1 $1
+			00 '2 :pick-color2 "Color2 $1
+			00 '3 :pick-color3 "Color3 $1
+			00 '4 :pick-color4 "Color4 $1
 		03 "Options $1
 			00 08 :option-erase "Erase $1
 			00 20 :option-zoom "Zoom $1
 			00 1b :option-deselect "Deselect $1
-

src/nasu.tal

@@ -85,7 +85,7 @@
 	#21 .Screen/sprite DEO
 	#00 .Screen/auto DEO
 	( let's begin! )
-	;new-file JSR2
+	;file-new JSR2
 
 BRK
 
@@ -143,7 +143,7 @@ BRK
 
 	DUP ,&no-null JCN POP JMP2r &no-null
 	[ #08 ] NEQk NIP ,&no-pop JCN ;filepath ;spop JSR2 POP JMP2r &no-pop
-	[ #0a ] NEQk NIP ,&no-load JCN ;load-file JSR2 &no-load
+	[ #0a ] NEQk NIP ,&no-load JCN ;file-open JSR2 &no-load
 	[ #7f ] NEQk NIP ,&no-delete JCN ;filepath #0040 ;mclr JSR2 POP JMP2r &no-delete
 	[ #20 ] GTHk NIP ,&no-special JCN ;untrap JSR2 POP JMP2r &no-special
 	;filepath ;slen JSR2 NIP #3f EQU ,&no-push JCN
@@ -220,14 +220,14 @@ BRK
 
 	.Controller/key DEI
 	( copy/paste/cut )
-	[ LIT 'c ] NEQk NIP ,&no-copy JCN ;copy-snarf JSR2 &no-copy
-	[ LIT 'v ] NEQk NIP ,&no-paste JCN ;paste-snarf JSR2 &no-paste
-	[ LIT 'x ] NEQk NIP ,&no-cut JCN ;cut-snarf JSR2 &no-cut
+	[ LIT 'c ] NEQk NIP ,&no-copy JCN ;edit-copy JSR2 &no-copy
+	[ LIT 'v ] NEQk NIP ,&no-paste JCN ;edit-paste JSR2 &no-paste
+	[ LIT 'x ] NEQk NIP ,&no-cut JCN ;edit-cut JSR2 &no-cut
 	( new/rename/open/save )
-	[ LIT 'n ] NEQk NIP ,&no-new JCN ;new-file JSR2 &no-new
+	[ LIT 'n ] NEQk NIP ,&no-new JCN ;file-new JSR2 &no-new
 	[ LIT 'r ] NEQk NIP ,&no-name JCN ;trap JSR2 &no-name
-	[ LIT 'o ] NEQk NIP ,&no-open JCN ;load-file JSR2 &no-open
-	[ LIT 's ] NEQk NIP ,&no-save JCN ;save-file JSR2 &no-save
+	[ LIT 'o ] NEQk NIP ,&no-open JCN ;file-open JSR2 &no-open
+	[ LIT 's ] NEQk NIP ,&no-save JCN ;file-save JSR2 &no-save
 	POP
 
 BRK
@@ -316,9 +316,9 @@ BRK
 
 	( release mouse ) #00 .Mouse/state DEO
 	.Mouse/x DEI2 .toolview/x1 LDZ2 SUB2 #03 SFT2 NIP
-	[ #1f ] NEQk NIP ,&no-save JCN ;save-file JSR2 POP BRK &no-save
-	[ #1d ] NEQk NIP ,&no-load JCN ;load-file JSR2 POP BRK &no-load
-	[ #1c ] NEQk NIP ,&no-name JCN ;new-file JSR2 POP BRK &no-name
+	[ #1f ] NEQk NIP ,&no-save JCN ;file-save JSR2 POP BRK &no-save
+	[ #1d ] NEQk NIP ,&no-load JCN ;file-open JSR2 POP BRK &no-load
+	[ #1c ] NEQk NIP ,&no-name JCN ;file-new JSR2 POP BRK &no-name
 	[ #04 ] NEQk NIP ,&no-tool0 JCN #00 ;set-tool JSR2 POP BRK &no-tool0
 	[ #05 ] NEQk NIP ,&no-tool1 JCN #01 ;set-tool JSR2 POP BRK &no-tool1
 	[ #06 ] NEQk NIP ,&no-tool2 JCN #02 ;set-tool JSR2 &no-tool2
@@ -1079,7 +1079,7 @@ JMP2r
 
 ( file )
 
-@new-file ( -- )
+@file-new ( -- )
 
 	#00 ;draw-filepath JSR2
 	( clear )
@@ -1093,7 +1093,11 @@ JMP2r
 
 JMP2r
 
-@load-file ( -- )
+@file-rename ( -- )
+
+JMP2r
+
+@file-open ( -- )
 
 	( clear )
 	;spritesheet #1200 ;mclr JSR2
@@ -1113,7 +1117,7 @@ JMP2r
 
 JMP2r
 
-@save-file ( -- )
+@file-save ( -- )
 
 	( spritesheet )
 	;filepath .File/name DEO2
@@ -1161,11 +1165,11 @@ JMP2r
 
 JMP2r
 
-( snarf )
+( edit )
 
 @snarf-txt ".snarf $1
 
-@copy-snarf ( -- )
+@edit-copy ( -- )
 
 	;snarf-txt .File/name DEO2
 	#0010 .File/length DEO2
@@ -1184,7 +1188,7 @@ JMP2r
 JMP2r
 	&buf $10
 
-@paste-snarf ( -- )
+@edit-paste ( -- )
 
 	;snarf-txt .File/name DEO2
 	#0010 .File/length DEO2
@@ -1201,15 +1205,42 @@ JMP2r
 
 JMP2r
 
-@cut-snarf ( -- )
+@edit-cut ( -- )
 
-	;copy-snarf JSR2
+	;edit-copy JSR2
 	;op-erase ;run JSR2
 	.selection/x1 LDZ2 .selection/x2 STZ2
 	;redraw JSR2
 
 JMP2r
 
+( select )
+
+@select-brush ( -- ) JMP2r
+@select-selector ( -- ) JMP2r
+@select-zoom ( -- ) JMP2r
+@select-up ( -- ) JMP2r
+@select-down ( -- ) JMP2r
+@select-left ( -- ) JMP2r
+@select-right ( -- ) JMP2r
+@select-dech ( -- ) JMP2r
+@select-inch ( -- ) JMP2r
+@select-decw ( -- ) JMP2r
+@select-incw ( -- ) JMP2r
+
+( pick )
+
+@pick-color1 ( -- ) JMP2r
+@pick-color2 ( -- ) JMP2r
+@pick-color3 ( -- ) JMP2r
+@pick-color4 ( -- ) JMP2r
+
+( option )
+
+@option-erase ( -- ) JMP2r
+@option-zoom ( -- ) JMP2r
+@option-deselect ( -- ) JMP2r
+
 ( generics )
 
 @set-size ( x1 y1 w* h* rect* -- )
@@ -1438,7 +1469,7 @@ JMP2r
 	1010 1010 1010 1000 0804 0402 0404 0800
 	0000 0032 4c00 0000 0000 0000 0000 0000
 
-( ~src/manifest.tal )
+~src/manifest.tal
 
 |8000
 	@spritesheet $1000