M src/manifest.tal => src/manifest.tal +1 -3
@@ 26,16 26,14 @@
44 00 :move-decw "Decr.W $1
84 00 :move-incw "Incr.W $1
00 1b :move-reset "Reset $1
- 03 "Tool $1
+ 07 "Tool $1
00 'q :tool-brush "Brush $1
00 'w :tool-selector "Selector $1
00 'e :tool-zoom "Zoom $1
- 04 "Color $1
00 '1 :pick-color1 "Background $1
00 '2 :pick-color2 "ColorA $1
00 '3 :pick-color3 "ColorB $1
00 '4 :pick-color4 "ColorC $1
-
$1
M src/nasu.tal => src/nasu.tal +11 -16
@@ 43,13 43,16 @@
#0a6f .System/r DEO2
#05cf .System/g DEO2
#0caf .System/b DEO2
+ ( size )
+ #012e .Screen/width DEO2
+ #00f0 .Screen/height DEO2
( vectors )
;on-console .Console/vector DEO2
;on-button .Controller/vector DEO2
;on-mouse .Mouse/vector DEO2
;on-frame .Screen/vector DEO2
( set defaults )
- #0100 .frame/width STZ2
+ #0108 .frame/width STZ2
#00c8 .frame/height STZ2
#01 .settings/depth STZ
#01 .settings/color STZ
@@ 59,15 62,15 @@
#00 .settings/brush STZ
#0000 ;set-focus JSR2
( place )
- .Screen/width DEI2 #01 SFT2 .frame/width LDZ2 #01 SFT2 SUB2 .Screen/height DEI2 #01 SFT2 .frame/height LDZ2 #01 SFT2 SUB2 .frame/width LDZ2 .frame/height LDZ2 ;frame ;set-size JSR2
+ .Screen/width DEI2 #01 SFT2 .frame/width LDZ2 #01 SFT2 SUB2 #001c .frame/width LDZ2 .frame/height LDZ2 ;frame ;set-size JSR2
.frame/x1 LDZ2 #0001 SUB2 .frame/y1 LDZ2 #0038 ADD2 #007f #007f ;tileview ;set-size JSR2
- .frame/x1 LDZ2 #007f ADD2 .frame/y1 LDZ2 #0038 ADD2 #007f #007f ;nametable ;set-size JSR2
+ .frame/x1 LDZ2 #0088 ADD2 .frame/y1 LDZ2 #0038 ADD2 #007f #007f ;nametable ;set-size JSR2
.frame/x1 LDZ2 #0001 SUB2 .frame/y1 LDZ2 #001f #002f ;zoomview ;set-size JSR2
.frame/x1 LDZ2 #002f ADD2 .frame/y1 LDZ2 #001f #002f ;preview ;set-size JSR2
.frame/x1 LDZ2 #005f ADD2 .frame/y1 LDZ2 #0020 #002f ;colorview ;set-size JSR2
.frame/x1 LDZ2 #008f ADD2 .frame/y1 LDZ2 #001f #002f ;blendview ;set-size JSR2
.frame/x1 LDZ2 #00bf ADD2 .frame/y1 LDZ2 #0048 #002f ;dataview ;set-size JSR2
- .tileview/x1 LDZ2 .tileview/y2 LDZ2 #0008 ADD2 #0100 #0008 ;toolview ;set-size JSR2
+ .tileview/x1 LDZ2 .tileview/y2 LDZ2 #0008 ADD2 .frame/width LDZ2 #0008 ;toolview ;set-size JSR2
( static drawings )
;load-theme JSR2
;draw-once JSR2
@@ 907,7 910,7 @@ JMP2r
.dataview/x1 LDZ2 .Screen/x DEO2
#00 OVR #10 SFT .settings/focus LDZ2 ADD2
( ch1 ) LDA2k #01 ;draw-short JSR2
- .Screen/x DEI2k #0004 ADD2 ROT DEO2
+ .Screen/x DEI2k #000c ADD2 ROT DEO2
( ch2 ) #0008 ADD2 LDA2 #02 ;draw-short JSR2
( skip line )
.Screen/y DEI2k #0008 ADD2 ROT DEO2
@@ 995,16 998,8 @@ JMP2r
@draw-once ( -- )
- .frame/x1 LDZ2 #0009 SUB2 .frame/y1 LDZ2 #0030 ADD2 #20 #10 ;frame-icns ;draw-frame JSR2
- ( spacers )
- ;spacer-icn .Screen/addr DEO2
- .frame/x1 LDZ2 #007b ADD2 .Screen/x DEO2
- .frame/y1 LDZ2 #0030 ADD2 .Screen/y DEO2
- #01 .Screen/sprite DEO
- ;spacer-icn .Screen/addr DEO2
- .frame/x1 LDZ2 #007b ADD2 .Screen/x DEO2
- .frame/y1 LDZ2 #00b8 ADD2 .Screen/y DEO2
- #21 .Screen/sprite DEO
+ .tileview/x1 LDZ2 #0008 SUB2 .tileview/y1 LDZ2 #0008 SUB2 #10 #10 ;frame-icns ;draw-frame JSR2
+ .nametable/x LDZ2 #0008 SUB2 .nametable/y LDZ2 #0008 SUB2 #10 #10 ;frame-icns ;draw-frame JSR2
#00 .Screen/auto DEO
JMP2r
@@ 1261,7 1256,7 @@ JMP2r
&repeat
#00
&repeat-loop
- #01 .Screen/sprite DEO
+ #05 .Screen/sprite DEO
INC GTHk ,&repeat-loop JCN
POP2
JMP2r