Browse code
(calc.tal) Merged a few unnecessary SFT
neauoire authored on 15/03/2022 18:13:35
Showing 1 changed files
| ... | ... |
@@ -39,21 +39,21 @@ |
| 39 | 39 |
.Screen/width DEI2 #01 SFT2 .center/x STZ2 |
| 40 | 40 |
.Screen/height DEI2 #01 SFT2 .center/y STZ2 |
| 41 | 41 |
.center/x LDZ2 #0020 SUB2 |
| 42 |
- DUP2 .keypad-frame/x STZ2 #0040 ADD2 .keypad-frame/x2 STZ2 |
|
| 42 |
+ DUP2 .keypad-frame/x STZ2 #003f ADD2 .keypad-frame/x2 STZ2 |
|
| 43 | 43 |
.center/y LDZ2 #0018 SUB2 |
| 44 | 44 |
DUP2 .keypad-frame/y STZ2 #003f ADD2 .keypad-frame/y2 STZ2 |
| 45 | 45 |
.keypad-frame/x LDZ2 |
| 46 |
- DUP2 .modpad-frame/x STZ2 #0040 ADD2 .modpad-frame/x2 STZ2 |
|
| 46 |
+ DUP2 .modpad-frame/x STZ2 #003f ADD2 .modpad-frame/x2 STZ2 |
|
| 47 | 47 |
.keypad-frame/y LDZ2 #0040 ADD2 |
| 48 | 48 |
DUP2 .modpad-frame/y STZ2 #001f ADD2 .modpad-frame/y2 STZ2 |
| 49 | 49 |
.keypad-frame/x LDZ2 |
| 50 |
- DUP2 .bitpad-frame/x STZ2 #0040 ADD2 .bitpad-frame/x2 STZ2 |
|
| 50 |
+ DUP2 .bitpad-frame/x STZ2 #003f ADD2 .bitpad-frame/x2 STZ2 |
|
| 51 | 51 |
.modpad-frame/y2 LDZ2 #0008 ADD2 |
| 52 | 52 |
DUP2 .bitpad-frame/y STZ2 #000f ADD2 .bitpad-frame/y2 STZ2 |
| 53 | 53 |
.center/x LDZ2 #0020 SUB2 |
| 54 |
- DUP2 .input-frame/x STZ2 #0040 ADD2 .input-frame/x2 STZ2 |
|
| 54 |
+ DUP2 .input-frame/x STZ2 #003f ADD2 .input-frame/x2 STZ2 |
|
| 55 | 55 |
.center/y LDZ2 #002a SUB2 |
| 56 |
- DUP2 .input-frame/y STZ2 #0010 ADD2 .input-frame/y2 STZ2 |
|
| 56 |
+ DUP2 .input-frame/y STZ2 #000f ADD2 .input-frame/y2 STZ2 |
|
| 57 | 57 |
( theme support ) |
| 58 | 58 |
;load-theme JSR2 |
| 59 | 59 |
|
| ... | ... |
@@ -152,7 +152,7 @@ BRK |
| 152 | 152 |
|
| 153 | 153 |
@click-bitpad ( state* x* y* -> ) |
| 154 | 154 |
|
| 155 |
- ( y ) .bitpad-frame/y LDZ2 SUB2 #03 SFT2 NIP #30 SFT STH |
|
| 155 |
+ ( y ) .bitpad-frame/y LDZ2 SUB2 #33 SFT2 NIP STH |
|
| 156 | 156 |
( x ) .bitpad-frame/x LDZ2 SUB2 #03 SFT2 NIP |
| 157 | 157 |
( value ) STHr ADD STHk |
| 158 | 158 |
|
| ... | ... |
@@ -438,7 +438,7 @@ JMP2r |
| 438 | 438 |
( layout ) #00 OVR ;keypad/layout ADD2 LDA |
| 439 | 439 |
( layout addr ) #00 SWP #30 SFT2 ;font-hex ADD2 STH2 |
| 440 | 440 |
( x ) #00 OVR #03 AND #40 SFT2 STH2 |
| 441 |
- ( y ) #00 OVR #02 SFT #40 SFT2 |
|
| 441 |
+ ( y ) #00 OVR #42 SFT2 |
|
| 442 | 442 |
( origin-x ) STH2r .keypad-frame/x LDZ2 ADD2 SWP2 |
| 443 | 443 |
( origin-y ) .keypad-frame/y LDZ2 ADD2 |
| 444 | 444 |
STH2r STHr STHr ;draw-key JSR2 |
| ... | ... |
@@ -455,7 +455,7 @@ JMP2r |
| 455 | 455 |
&loop |
| 456 | 456 |
( state ) DUP STHkr EQU STH |
| 457 | 457 |
( glyph ) #00 OVR #30 SFT2 ;mod-icns ADD2 STH2 |
| 458 |
- ( y ) #00 OVR #02 SFT #40 SFT2 .modpad-frame/y LDZ2 ADD2 STH2 |
|
| 458 |
+ ( y ) #00 OVR #42 SFT2 .modpad-frame/y LDZ2 ADD2 STH2 |
|
| 459 | 459 |
( x ) #00 OVR #03 AND #40 SFT2 .modpad-frame/x LDZ2 ADD2 STH2 |
| 460 | 460 |
STH2r STH2r STH2r STHr #03 ;draw-key JSR2 |
| 461 | 461 |
INC GTHk ,&loop JCN |
| ... | ... |
@@ -468,7 +468,7 @@ JMP2r |
| 468 | 468 |
|
| 469 | 469 |
#1000 |
| 470 | 470 |
&loop |
| 471 |
- ( y ) #00 OVR #03 SFT #30 SFT2 .bitpad-frame/y LDZ2 ADD2 .Screen/y DEO2 |
|
| 471 |
+ ( y ) #00 OVR #33 SFT2 .bitpad-frame/y LDZ2 ADD2 .Screen/y DEO2 |
|
| 472 | 472 |
( x ) #00 OVR #07 AND #30 SFT2 .bitpad-frame/x LDZ2 ADD2 .Screen/x DEO2 |
| 473 | 473 |
( state ) DUP #0f SWP SUB .input/value LDZ2 ROT SFT2 #0001 AND2 |
| 474 | 474 |
( addr ) #30 SFT2 ;bit-icns ADD2 .Screen/addr DEO2 |
| ... | ... |
@@ -521,13 +521,10 @@ JMP2r |
| 521 | 521 |
.input/mode LDZ ,&decimal JCN |
| 522 | 522 |
#01 .Screen/auto DEO |
| 523 | 523 |
#00 ,&digit JSR |
| 524 |
- SWP |
|
| 524 |
+ SWP ,&byte JSR |
|
| 525 |
+ &byte |
|
| 525 | 526 |
STHk #04 SFT ,&digit JSR |
| 526 |
- STHr #0f AND ,&digit JSR |
|
| 527 |
- STHk #04 SFT ,&digit JSR |
|
| 528 |
- STHr #0f AND ,&digit JSR |
|
| 529 |
- #00 .Screen/auto DEO |
|
| 530 |
- JMP2r |
|
| 527 |
+ STHr #0f AND |
|
| 531 | 528 |
&digit ( num -- ) |
| 532 | 529 |
,&addr JSR .Screen/addr DEO2 |
| 533 | 530 |
[ LIT &color $1 ] .Screen/sprite DEO |