Browse code
Minor cleanup
neauoire authored on 19/03/2021 18:49:57
Showing 1 changed files
| ... | ... |
@@ -19,9 +19,9 @@ |
| 19 | 19 |
%RTN { JMP2r }
|
| 20 | 20 |
%RTN? { JMP2r? }
|
| 21 | 21 |
%++ { #0001 ADD2 } %-- { #0001 SUB2 }
|
| 22 |
-%2/ { #0001 SHR2 } %2* { #0001 SHL2 }
|
|
| 22 |
+%2/ { #0001 SHR2 }
|
|
| 23 | 23 |
%8/ { #0003 SHR2 } %8* { #0003 SHL2 }
|
| 24 |
-%8- { #0008 SUB2 } %8+ { #0008 ADD2 }
|
|
| 24 |
+%8+ { #0008 ADD2 }
|
|
| 25 | 25 |
%MOD8 { #0007 AND2 }
|
| 26 | 26 |
|
| 27 | 27 |
;center { x 2 y 2 }
|
| ... | ... |
@@ -36,6 +36,12 @@ |
| 36 | 36 |
|
| 37 | 37 |
|0100 @RESET |
| 38 | 38 |
|
| 39 |
+ ( default canvas ) |
|
| 40 |
+ #0020 =canvas.w #0010 =canvas.h |
|
| 41 |
+ |
|
| 42 |
+ ( default brush ) |
|
| 43 |
+ #04 =cursor.size |
|
| 44 |
+ |
|
| 39 | 45 |
( load file ) |
| 40 | 46 |
,filepath ,load-file JSR2 |
| 41 | 47 |
|
| ... | ... |
@@ -44,11 +50,6 @@ |
| 44 | 50 |
~Screen.height #0002 DIV2 =center.y |
| 45 | 51 |
#0010 =toolbar.x1 #0010 =toolbar.y1 |
| 46 | 52 |
|
| 47 |
- ( default brush ) |
|
| 48 |
- #04 =cursor.size |
|
| 49 |
- |
|
| 50 |
- #0020 =canvas.w #0010 =canvas.h ( 380x260 ) |
|
| 51 |
- |
|
| 52 | 53 |
( center canvas ) |
| 53 | 54 |
~center.x ~canvas.w 8* 2/ SUB2 =canvas.x1 |
| 54 | 55 |
~center.y ~canvas.h 8* 2/ SUB2 =canvas.y1 |
| ... | ... |
@@ -124,13 +125,13 @@ BRK |
| 124 | 125 |
$no-toggle-zoom |
| 125 | 126 |
DUP2 |
| 126 | 127 |
#0001 NEQ2 ,$no-load-button ROT JMP2? |
| 128 |
+ ,filepath ,load-file JSR2 |
|
| 127 | 129 |
( release ) #00 =Mouse.state |
| 128 |
- #bb =Console.byte |
|
| 129 | 130 |
$no-load-button |
| 130 | 131 |
DUP2 |
| 131 | 132 |
#0002 NEQ2 ,$no-save-button ROT JMP2? |
| 133 |
+ ,filepath ,save-file JSR2 |
|
| 132 | 134 |
( release ) #00 =Mouse.state |
| 133 |
- #cc =Console.byte |
|
| 134 | 135 |
$no-save-button |
| 135 | 136 |
POP2 |
| 136 | 137 |
|
| ... | ... |
@@ -163,7 +164,13 @@ BRK |
| 163 | 164 |
|
| 164 | 165 |
@load-file ( path ) |
| 165 | 166 |
|
| 166 |
- =File.name #8000 =File.length ,data =File.load |
|
| 167 |
+ =File.name ~canvas.w ~canvas.h MUL2 #0008 MUL2 =File.length ,data =File.load |
|
| 168 |
+ |
|
| 169 |
+RTN |
|
| 170 |
+ |
|
| 171 |
+@save-file |
|
| 172 |
+ |
|
| 173 |
+ =File.name ~canvas.w ~canvas.h MUL2 #0008 MUL2 =File.length ,data =File.save |
|
| 167 | 174 |
|
| 168 | 175 |
RTN |
| 169 | 176 |
|
| ... | ... |
@@ -229,7 +236,7 @@ RTN |
| 229 | 236 |
~pos.x ~canvas.w 2/ SUB2 #0003 ADD2 =zoom.x |
| 230 | 237 |
~pos.y ~canvas.h 2/ SUB2 #0003 ADD2 =zoom.y |
| 231 | 238 |
$no-follow |
| 232 |
- |
|
| 239 |
+ |
|
| 233 | 240 |
#00 =px.x #00 =px.y |
| 234 | 241 |
$ver |
| 235 | 242 |
#00 =px.x |
| ... | ... |
@@ -414,7 +421,7 @@ RTN |
| 414 | 421 |
|
| 415 | 422 |
~cursor.x =Sprite.x |
| 416 | 423 |
~cursor.y =Sprite.y |
| 417 |
- ,brush_pointer #00 ~Controller #02 EQU 8* ADD2 =Sprite.addr |
|
| 424 |
+ ,pointers_icn #00 ~Controller #02 EQU 8* ADD2 =Sprite.addr |
|
| 418 | 425 |
#1f =Sprite.color |
| 419 | 426 |
|
| 420 | 427 |
RTN |
| ... | ... |
@@ -571,11 +578,9 @@ RTN |
| 571 | 578 |
[ 5580 0080 0080 0080 ] |
| 572 | 579 |
[ 55ff 7fff 7fff 7fff ] |
| 573 | 580 |
|
| 574 |
-@brush_pointer [ 80c0 e0f0 f8e0 1000 ] |
|
| 575 |
-@brush_hand [ 4040 4070 f8f8 f870 ] |
|
| 576 |
- |
|
| 577 |
-@mode_guidesoff [ 0038 4492 2810 0000 ] |
|
| 578 |
-@mode_guideson [ 0000 0082 4438 0000 ] |
|
| 581 |
+@pointers_icn |
|
| 582 |
+ [ 80c0 e0f0 f8e0 1000 ] |
|
| 583 |
+ [ 4040 4070 f8f8 f870 ] |
|
| 579 | 584 |
|
| 580 | 585 |
@load_icn [ feaa d6aa d4aa f400 ] |
| 581 | 586 |
@save_icn [ fe82 8282 848a f400 ] |