@@ 27,7 27,7 @@
%2** { #10 SFT2 } %2// { #01 SFT2 }
%8** { #30 SFT2 } %8// { #03 SFT2 }
-%TOS { #00 SWP } %TOB { SWP POP }
+%TOS { #00 SWP }
%MOD { DIVk MUL SUB } %MOD2 { DIV2k MUL2 SUB2 }
%RTN { JMP2r }
@@ 39,7 39,7 @@
%GTS2 { #8000 ++ SWP2 #8000 ++ << }
%STEP8 { #33 SFT2 }
%TOGGLE { LDZk #00 = SWP STZ }
-%GET-ITER { OVR2 SWP POP OVR SWP }
+%GET-ITER { OVR2 NIP OVR SWP }
%BRK? { #01 JCN BRK }
%HOR { #20 } %VER { #10 }
@@ 391,9 391,9 @@ BRK
.Mouse/state DEI DUP .cursor/last LDZ
DUP2 #0000 == ,&end JCN
DUP2 #0100 !! ,&no-down JCN
- .Mouse/x DEI2 .tileview/x1 LDZ2 -- 8// TOB
+ .Mouse/x DEI2 .tileview/x1 LDZ2 -- 8// NIP
DUP .selection/x1 STZ .selection/x2 STZ
- .Mouse/y DEI2 .tileview/y1 LDZ2 -- 8// TOB
+ .Mouse/y DEI2 .tileview/y1 LDZ2 -- 8// NIP
DUP .selection/y1 STZ .selection/y2 STZ
;clamp-selection JSR2
.selection LDZ2 GET-ADDR .settings/focus STZ2
@@ 401,8 401,8 @@ BRK
,&end JMP
&no-down
( release )
- .Mouse/x DEI2 .tileview/x1 LDZ2 -- 8// TOB .selection/x2 STZ
- .Mouse/y DEI2 .tileview/y1 LDZ2 -- 8// TOB .selection/y2 STZ
+ .Mouse/x DEI2 .tileview/x1 LDZ2 -- 8// NIP .selection/x2 STZ
+ .Mouse/y DEI2 .tileview/y1 LDZ2 -- 8// NIP .selection/y2 STZ
;clamp-selection JSR2 ;redraw JSR2
&end
POP2
@@ 431,7 431,7 @@ BRK
( skip ) .Mouse/state DEI #00 ! BRK?
- .Mouse/x DEI2 .toolview/x1 LDZ2 -- 8// TOB
+ .Mouse/x DEI2 .toolview/x1 LDZ2 -- 8// NIP
DUP HOR SWP - #01 ! ,&no-save JCN
;save-file JSR2
@@ 489,8 489,8 @@ BRK
( skip ) .Mouse/state DEI #00 ! BRK?
- .Mouse/y DEI2 .zoomview/y1 LDZ2 -- 8// TOB #04 ! ;&no-mod JCN2
- .Mouse/x DEI2 .zoomview/x1 LDZ2 -- 8// TOB
+ .Mouse/y DEI2 .zoomview/y1 LDZ2 -- 8// NIP #04 ! ;&no-mod JCN2
+ .Mouse/x DEI2 .zoomview/x1 LDZ2 -- 8// NIP
DUP #00 = .Mouse/state DEI #01 = #0101 !! ,&no-shiftup JCN
;op-shift-tile-up ;run-selection JSR2
SET-STATE &no-shiftup
@@ 532,8 532,8 @@ BRK
( skip ) .Mouse/state DEI #00 ! BRK?
- .Mouse/x DEI2 .blendview/x1 LDZ2 -- 8// TOB
- .Mouse/y DEI2 .blendview/y1 LDZ2 -- 8// TOB #04 * +
+ .Mouse/x DEI2 .blendview/x1 LDZ2 -- 8// NIP
+ .Mouse/y DEI2 .blendview/y1 LDZ2 -- 8// NIP #04 * +
.settings/blending STZ
;redraw JSR2
@@ 546,7 546,7 @@ BRK
( skip ) .Mouse/state DEI #00 ! BRK?
- .Mouse/y DEI2 .colorview/y1 LDZ2 -- 8// TOB
+ .Mouse/y DEI2 .colorview/y1 LDZ2 -- 8// NIP
DUP #00 ! ,&no-r JCN
.System/r STHk ,&set-color JSR
@@ 571,7 571,7 @@ BRK
STHr #02 MOD STHk
#0f SWP [ #40 * SFT ] AND
STHr #00 =
- .Mouse/x DEI2 .colorview/x1 LDZ2 -- 2// TOB
+ .Mouse/x DEI2 .colorview/x1 LDZ2 -- 2// NIP
( clamp to #0f ) DUP #10 = #01 * -
SWP [ #40 * SFT ] +
RTN
@@ 582,8 582,8 @@ BRK
( skip ) .Mouse/state DEI #00 ! BRK?
- ( y ) .Mouse/y DEI2 .preview/y1 LDZ2 -- 8// TOB
- ( x ) .Mouse/x DEI2 .preview/x1 LDZ2 -- 8// TOB
+ ( y ) .Mouse/y DEI2 .preview/y1 LDZ2 -- 8// NIP
+ ( x ) .Mouse/x DEI2 .preview/x1 LDZ2 -- 8// NIP
#40 SFT + #11 +
.settings/ratio STZ
@@ 827,7 827,7 @@ RTN
( channel 1 )
OVR2 SWP2 ,get-addr JSR [ STH2k ] LDA
- ROT ROT TOB MOD8 [ STHk ]
+ ROT ROT NIP MOD8 [ STHk ]
#07 SWP - SFT #01 AND
( channel 2 )
[ STHr ] [ STH2r ] #0008 ++ LDA SWP
@@ 865,7 865,7 @@ RTN
STH2
DUP2 LDA
- STH SWP2 TOB
+ STH SWP2 NIP
STHr SWP
STH2r SFT #01 AND ,&do-set JCN
( mask ) #01 #07 ROT MOD8 - SFL #ff EOR AND
@@ 1296,7 1296,7 @@ RTN
&loop
( limit at selection )
OVRr STHr .selection/x2 LDZ #01 + LTH ,&linebreak JCN
- STH2r #01 + SWP POP .selection/x1 LDZ SWP STH2
+ STH2r #01 + NIP .selection/x1 LDZ SWP STH2
&linebreak
DUP2 [ DATA-CLIP ++ ] [ STH2kr GET-ADDR ] ;copy-tile JSR2
( move-x ) SWPr LITr 01 ADDr SWPr