mask defaults

This commit is contained in:
Joshua Bell 2017-09-15 01:02:38 -07:00
parent a2c64de108
commit b2b36a2e32
6 changed files with 27 additions and 26 deletions

View File

@ -354,6 +354,9 @@ A2D_CWS_SCROLL_THUMB := 1 << 6
A2D_CWS_SCROLL_TRACK := 1 << 0
A2D_CWS_SCROLL_NORMAL := A2D_CWS_SCROLL_ENABLED | A2D_CWS_SCROLL_THUMB | A2D_CWS_SCROLL_TRACK
;;; Used in various state blocks
A2D_DEFAULT_MSKAND := $FF
A2D_DEFAULT_MSKOR := $00
;;; ==================================================
;;; Macros

View File

@ -747,8 +747,8 @@ voffset:.word 0
width: .word window_width
height: .word window_height
pattern:.res 8, $FF
mskand: .byte $FF
mskor: .byte $00
mskand: .byte A2D_DEFAULT_MSKAND
mskor: .byte A2D_DEFAULT_MSKOR
.byte 0,0,0,0 ; ???
hthick: .byte 1
vthick: .byte 1

View File

@ -265,8 +265,8 @@ h1: .word 100
w2: .word $1F4
h2: .word $1F4
.proc box
left: .word $B4
top: .word $32
left: .word 180
top: .word 50
saddr: .addr A2D_SCREEN_ADDR
stride: .word A2D_SCREEN_STRIDE
hoff: .word 0
@ -275,8 +275,8 @@ width: .word $C7
height: .word $40
.endproc
pattern:.res 8,$00
mskand: .byte $FF
mskor: .byte $00
mskand: .byte A2D_DEFAULT_MSKAND
mskor: .byte A2D_DEFAULT_MSKOR
.byte $00,$00,$00,$00
hthick: .byte 4
vthick: .byte 2

View File

@ -609,8 +609,8 @@ width: .word default_width
height: .word default_height
pattern:.res 8, $FF
mskand: .byte $FF
mskor: .byte $00
mskand: .byte A2D_DEFAULT_MSKAND
mskor: .byte A2D_DEFAULT_MSKOR
.byte 0,0,0,0
hthick: .byte 1
vthick: .byte 1
@ -628,8 +628,8 @@ voffset:.word 0
width: .word default_width
height: .word default_height
pattern:.res 8, $FF
mskand: .byte $FF
mskor: .byte $00
mskand: .byte A2D_DEFAULT_MSKAND
mskor: .byte A2D_DEFAULT_MSKOR
.byte 0,0,0,0
hthick: .byte 1
vthick: .byte 1

View File

@ -231,15 +231,15 @@ left: .word default_left
top: .word default_top
addr: .word A2D_SCREEN_ADDR
stride: .word A2D_SCREEN_STRIDE
hoffset:.word 0 ; Also used for A2D_CLEAR_BOX
hoffset:.word 0
voffset:.word 0
width: .word default_width
height: .word default_height
.endproc
pattern:.byte $00,$00,$00,$00,$00,$00,$00,$00
mskand: .byte $FF
mskor: .byte $00
pattern:.res 8, 0
mskand: .byte A2D_DEFAULT_MSKAND
mskor: .byte A2D_DEFAULT_MSKOR
.byte $00,$00,$00,$00
hthick: .byte 1
vthick: .byte 1

View File

@ -36,7 +36,7 @@ call_main_addr := call_main_trampoline+7 ; address patched in her
.scope
sta RAMWRTON
sta RAMRDON
ldx #(call_main_template_end - call_main_template)
ldx #sizeof_call_main_template
loop: lda call_main_template,x
sta call_main_trampoline,x
dex
@ -52,8 +52,7 @@ loop: lda call_main_template,x
sta RAMWRTON
rts
.endproc
call_main_template_end: ; can't .sizeof(proc) before declaration
;; https://github.com/cc65/cc65/issues/478
sizeof_call_main_template := * - call_main_template
.proc call_init
;; run the DA
@ -309,14 +308,13 @@ hsmax: .byte 32
hspos: .byte 0
vsmax: .byte 255
vspos: .byte 0
.byte 0, 0 ; ???
w1: .word 200
h1: .word 51
w2: .word default_width
h2: .word default_height
;; ???
.byte $00,$00,$C8,$00,$33,$00
width: .word default_width
height: .word default_height
.proc box ; or whole window ??
.proc box
left: .word default_left
top: .word default_top
addr: .word A2D_SCREEN_ADDR
@ -328,8 +326,8 @@ height: .word default_height
.endproc
pattern:.res 8, $00
mskand: .byte $FF
mskor: .byte $00
mskand: .byte A2D_DEFAULT_MSKAND
mskor: .byte A2D_DEFAULT_MSKOR
.byte $00,$00,$00,$00
hthick: .byte 1
vthick: .byte 1