From bbea9376526671cd2800c943f046bf662a6ddeee Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Mon, 8 May 2023 13:47:52 -0700 Subject: [PATCH] Migrated a few immediates --- src/nasu.tal | 130 +++++++++++++++++++++------------------------------ 1 file changed, 53 insertions(+), 77 deletions(-) diff --git a/src/nasu.tal b/src/nasu.tal index 862585e..d541721 100644 --- a/src/nasu.tal +++ b/src/nasu.tal @@ -324,7 +324,7 @@ BRK DUP #01 EQU .Mouse/state DEI #01 GTH #0101 NEQ2 ?&no-shiftleft ;op-shiftl run &no-shiftleft POP ( release mouse ) #00 .Mouse/state DEO - ,&finish JMP + !&finish &no-mod .Mouse/x DEI2 .zoomview/x1 LDZ2 SUB2 #02 SFT2 #00 .selection/x1 LDZ #30 SFT2 ADD2 @@ -374,7 +374,7 @@ BRK .Mouse/x DEI2 .blendview/x1 LDZ2 SUB2 #03 SFT2 NIP .Mouse/y DEI2 .blendview/y1 LDZ2 SUB2 #03 SFT2 NIP #20 SFT ADD - [ #0f GTHk NIP ] ?&no-set DUP .settings/blend STHk LDZ #b0 AND ADD STHr STZ ,&end JMP &no-set + [ #0f GTHk NIP ] ?&no-set DUP .settings/blend STHk LDZ #b0 AND ADD STHr STZ !&end &no-set ( buttons ) #03 AND [ #02 NEQk NIP ] ?&no-ver .settings/blend STHk LDZ #20 EOR STHr STZ &no-ver @@ -394,24 +394,21 @@ BRK .settings/zoom LDZk #00 EQU SWP STZ draw-tileview - ;draw-toolview ( .. ) -JMP2 +!draw-toolview @set-color ( color -- ) .settings/color STZ draw-toolview - ;draw-colorview ( .. ) -JMP2 +!draw-colorview @set-tool ( tool -- ) .settings/tool STZ - ;draw-toolview ( .. ) -JMP2 +!draw-toolview @clamp-selection ( -- ) @@ -441,18 +438,16 @@ JMP2r DUP .selection/x1 STZ .selection/x2 STZ set-focus - ;redraw ( .. ) -JMP2 +!redraw @set-selection-to ( x y -- ) .selection/y2 STZ .selection/x2 STZ clamp-selection - ;redraw ( .. ) -JMP2 +!redraw @set-focus ( -- ) @@ -483,9 +478,7 @@ JMP2r ( focus ) set-focus - ;redraw ( .. ) - -JMP2 +!redraw @mod-selection-zoom ( x y -- ) @@ -497,9 +490,8 @@ JMP2 .selection/zx LDZ #03 SFT .selection/zy LDZ #03 SFT set-selection-from - ;draw-tileview-zoom ( .. ) -JMP2 +!draw-tileview-zoom @scale-selection ( x y -- ) @@ -515,9 +507,8 @@ JMP2 &no-y ( focus ) set-focus - ;redraw ( .. ) -JMP2 +!redraw ( @|map ) @@ -540,9 +531,9 @@ JMP2r @op-erase ( addr* -- ) - #0010 ;mclr ( .. ) + #0010 -JMP2 +!mclr @op-shiftu ( addr* -- ) @@ -588,11 +579,11 @@ JMP2r #0800 &loop ( ch1 ) - #00 OVR STH2kr ADD2 DUP2 - LDA rol ROT ROT STA + #00 OVR STH2kr ADD2 + LDAk rol ROT ROT STA ( ch2 ) - #00 OVR STH2kr #0008 ADD2 ADD2 DUP2 - LDA rol ROT ROT STA + #00 OVR STH2kr #0008 ADD2 ADD2 + LDAk rol ROT ROT STA INC GTHk ?&loop POP2 POP2r @@ -605,11 +596,11 @@ JMP2r #0800 &loop ( ch1 ) - #00 OVR STH2kr ADD2 DUP2 - LDA ror ROT ROT STA + #00 OVR STH2kr ADD2 + LDAk ror ROT ROT STA ( ch2 ) - #00 OVR STH2kr #0008 ADD2 ADD2 DUP2 - LDA ror ROT ROT STA + #00 OVR STH2kr #0008 ADD2 ADD2 + LDAk ror ROT ROT STA INC GTHk ?&loop POP2 POP2r @@ -648,9 +639,8 @@ JMP2r draw-preview draw-tileview draw-nametable - ;draw-zoomview ( .. ) -JMP2 +!draw-zoomview @draw-tileview ( -- ) @@ -889,9 +879,9 @@ JMP2r .preview/x1 LDZ2 .Screen/x DEO2 .preview/y2 LDZ2 #0008 SUB2 .Screen/y DEO2 #03 ;draw-chr/color STA - .settings/ratio LDZ ;draw-byte ( .. ) + .settings/ratio LDZ -JMP2 +!draw-byte @draw-colorview ( -- ) @@ -1015,9 +1005,9 @@ JMP2r ;make-icn .Screen/addr DEO2 #01 .Screen/sprite DEO ( filepath ) - #01 ;draw-filepath ( .. ) + #01 -JMP2 +!draw-filepath @draw-state ( -- ) @@ -1179,9 +1169,8 @@ JMP2r ;filepath #0040 mclr ;untitled-txt ;filepath scpy #00 .state/changed STZ draw-state - ;redraw ( .. ) -JMP2 +!redraw @file-open ( -- ) @@ -1199,9 +1188,8 @@ JMP2 ;filepath scap #0004 SUB2 #0004 mclr #00 .state/changed STZ draw-state - ;redraw ( .. ) -JMP2 +!redraw @file-open-mono ( -- ) @@ -1216,9 +1204,8 @@ JMP2 INC NEQk ?&loop POP2 #00 .state/changed STZ draw-state - ;redraw ( .. ) -JMP2 +!redraw @file-save ( -- ) @@ -1236,9 +1223,9 @@ JMP2 ;filepath scap #0004 SUB2 #0004 mclr &no-nametable - #00 .state/changed STZ ;draw-state ( .. ) + #00 .state/changed STZ -JMP2 +!draw-state @file-save-mono ( -- ) @@ -1250,9 +1237,9 @@ JMP2 #00 OVR #40 SFT2 ;spritesheet ADD2 .File/write DEO2 INC NEQk ?&loop POP2 - #00 .state/changed STZ ;draw-state ( .. ) + #00 .state/changed STZ -JMP2 +!draw-state @save-theme ( -- ) @@ -1274,72 +1261,61 @@ JMP2r ;snarf-txt .File/name DEO2 #0008 ;op-write/length STA2 ;op-write run - ;redraw ( .. ) -JMP2 +!redraw @edit-copy-chr ( -- ) ;snarf-txt .File/name DEO2 #0010 ;op-write/length STA2 ;op-write run - ;redraw ( .. ) -JMP2 +!redraw @edit-paste ( -- ) ;snarf-txt .File/name DEO2 #0010 .File/length DEO2 ;op-read run - ;redraw ( .. ) -JMP2 +!redraw @edit-cut ( -- ) edit-copy-chr ;op-erase run - ;redraw ( .. ) -JMP2 +!redraw @edit-erase ( -- ) ;op-erase run #01 .state/changed STZ draw-state - ;redraw ( .. ) -JMP2 +!redraw ( select ) -@tool-brush ( -- ) #00 ;set-tool JMP2 -@tool-selector ( -- ) #01 ;set-tool JMP2 -@tool-zoom ( -- ) #02 ;set-tool JMP2 - -@move-up ( -- ) #00ff ;mod-selection JMP2 -@move-down ( -- ) #0001 ;mod-selection JMP2 -@move-left ( -- ) #ff00 ;mod-selection JMP2 -@move-right ( -- ) #0100 ;mod-selection JMP2 -@move-dech ( -- ) #00ff ;scale-selection JMP2 -@move-inch ( -- ) #0001 ;scale-selection JMP2 -@move-decw ( -- ) #ff00 ;scale-selection JMP2 -@move-incw ( -- ) #0100 ;scale-selection JMP2 - -@move-reset ( -- ) - - .selection/x1 LDZ2 .selection/x2 STZ2 - ;redraw ( .. ) +@tool-brush ( -- ) #00 !set-tool +@tool-selector ( -- ) #01 !set-tool +@tool-zoom ( -- ) #02 !set-tool -JMP2 +@move-up ( -- ) #00ff !mod-selection +@move-down ( -- ) #0001 !mod-selection +@move-left ( -- ) #ff00 !mod-selection +@move-right ( -- ) #0100 !mod-selection +@move-dech ( -- ) #00ff !mod-selection +@move-inch ( -- ) #0001 !mod-selection +@move-decw ( -- ) #ff00 !mod-selection +@move-incw ( -- ) #0100 !mod-selection +@move-reset ( -- ) .selection/x1 LDZ2 .selection/x2 STZ2 !redraw ( pick ) -@pick-color1 ( -- ) #00 ;set-color JMP2 -@pick-color2 ( -- ) #01 ;set-color JMP2 -@pick-color3 ( -- ) #02 ;set-color JMP2 -@pick-color4 ( -- ) #03 ;set-color JMP2 +@pick-color1 ( -- ) #00 !set-color +@pick-color2 ( -- ) #01 !set-color +@pick-color3 ( -- ) #02 !set-color +@pick-color4 ( -- ) #03 !set-color ( generics )