Browse code
Fixed small issues with coloring in font
neauoire authored on 04/07/2021 18:38:51
Showing 1 changed files
| ... | ... |
@@ -9,9 +9,13 @@ |
| 9 | 9 |
%TOS { #00 SWP }
|
| 10 | 10 |
%INCR { SWP #01 ADD SWP }
|
| 11 | 11 |
|
| 12 |
+%DEBUG { ;print-hex JSR2 #0a .Console/write DEO }
|
|
| 13 |
+%DEBUG2 { SWP ;print-hex JSR2 ;print-hex JSR2 #0a .Console/write DEO }
|
|
| 14 |
+ |
|
| 12 | 15 |
( devices ) |
| 13 | 16 |
|
| 14 | 17 |
|00 @System &vector $2 &pad $6 &r $2 &g $2 &b $2 |
| 18 |
+|10 @Console &vector $2 &read $1 &pad $5 &write $1 |
|
| 15 | 19 |
|20 @Screen &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &color $1 |
| 16 | 20 |
|a0 @File &vector $2 &success $2 &offset $2 &pad $2 &name $2 &length $2 &load $2 &save $2 |
| 17 | 21 |
|
| ... | ... |
@@ -24,30 +28,30 @@ |
| 24 | 28 |
|0100 ( -> ) |
| 25 | 29 |
|
| 26 | 30 |
( theme ) |
| 27 |
- #0f7f .System/r DEO2 |
|
| 28 |
- #0fe0 .System/g DEO2 |
|
| 29 |
- #0fc0 .System/b DEO2 |
|
| 31 |
+ #0fca .System/r DEO2 |
|
| 32 |
+ #0eba .System/g DEO2 |
|
| 33 |
+ #0ec9 .System/b DEO2 |
|
| 30 | 34 |
|
| 31 | 35 |
( load font ) |
| 32 | 36 |
#4000 .File/length DEO2 |
| 33 | 37 |
;font-path-large .File/name DEO2 |
| 34 | 38 |
;font-data .File/load DEO2 |
| 35 | 39 |
( draw label ) |
| 36 |
- #0000 #0020 ;title #21 ;draw-uf3 JSR2 |
|
| 40 |
+ #0020 #0020 ;title #21 ;draw-uf3 JSR2 |
|
| 37 | 41 |
|
| 38 | 42 |
( load font ) |
| 39 | 43 |
#4000 .File/length DEO2 |
| 40 | 44 |
;font-path-medium .File/name DEO2 |
| 41 | 45 |
;font-data .File/load DEO2 |
| 42 | 46 |
( draw label ) |
| 43 |
- #0000 #0048 ;body #21 ;draw-uf2 JSR2 |
|
| 47 |
+ #0020 #0048 ;body #22 ;draw-uf2 JSR2 |
|
| 44 | 48 |
|
| 45 | 49 |
( load font ) |
| 46 | 50 |
#4000 .File/length DEO2 |
| 47 | 51 |
;font-path-small .File/name DEO2 |
| 48 | 52 |
;font-data .File/load DEO2 |
| 49 | 53 |
( draw label ) |
| 50 |
- #0010 #00b8 ;footer #21 ;draw-uf2 JSR2 |
|
| 54 |
+ #0030 #00b8 ;footer #23 ;draw-uf2 JSR2 |
|
| 51 | 55 |
|
| 52 | 56 |
BRK |
| 53 | 57 |
|
| ... | ... |
@@ -59,7 +63,7 @@ BRK |
| 59 | 63 |
&loop |
| 60 | 64 |
LDAk |
| 61 | 65 |
DUP #0a ! ,&no-linebreak JCN |
| 62 |
- ( move down ) OVR2 .Screen/x DEO2 |
|
| 66 |
+ ( move down ) STH OVR2 .Screen/x DEO2 STHr |
|
| 63 | 67 |
( incr y ) .Screen/y DEI2 #0010 ++ .Screen/y DEO2 |
| 64 | 68 |
POP ,&continue JMP &no-linebreak |
| 65 | 69 |
STHkr ,&sprite JSR |
| ... | ... |
@@ -120,7 +124,7 @@ RTN |
| 120 | 124 |
&ver |
| 121 | 125 |
#00 #03 |
| 122 | 126 |
&hor |
| 123 |
- #21 .Screen/color DEO |
|
| 127 |
+ STHkr .Screen/color DEO |
|
| 124 | 128 |
.Screen/x DEI2 #0008 ++ .Screen/x DEO2 |
| 125 | 129 |
.Screen/addr DEI2 #0008 ++ .Screen/addr DEO2 |
| 126 | 130 |
INCR LTHk ,&hor JCN |
| ... | ... |
@@ -136,6 +140,17 @@ RTN |
| 136 | 140 |
|
| 137 | 141 |
RTN |
| 138 | 142 |
|
| 143 |
+ |
|
| 144 |
+@print-hex ( value -- ) |
|
| 145 |
+ |
|
| 146 |
+ STHk #04 SFT ,&parse JSR .Console/write DEO |
|
| 147 |
+ STHr #0f AND ,&parse JSR .Console/write DEO |
|
| 148 |
+ RTN |
|
| 149 |
+ &parse ( value -- char ) |
|
| 150 |
+ DUP #09 GTH ,&above JCN #30 ADD RTN &above #09 SUB #60 ADD RTN |
|
| 151 |
+ |
|
| 152 |
+RTN |
|
| 153 |
+ |
|
| 139 | 154 |
@title |
| 140 | 155 |
5468 6520 466f 6720 486f 726e $1 |
| 141 | 156 |
|
| ... | ... |
@@ -160,10 +175,10 @@ RTN |
| 160 | 175 |
79 $1 |
| 161 | 176 |
|
| 162 | 177 |
@font-path-large |
| 163 |
- "projects/fonts/times24.uf3 $1 |
|
| 178 |
+ "projects/fonts/diamond20.uf3 $1 |
|
| 164 | 179 |
@font-path-medium |
| 165 |
- "projects/fonts/times15.uf2 $1 |
|
| 180 |
+ "projects/fonts/venice14.uf2 $1 |
|
| 166 | 181 |
@font-path-small |
| 167 |
- "projects/fonts/times12.uf2 $1 |
|
| 182 |
+ "projects/fonts/terminal12.uf2 $1 |
|
| 168 | 183 |
|
| 169 | 184 |
@font-data |
| 170 | 185 |
\ No newline at end of file |