moar cleanup

This commit is contained in:
Dagen Brock 2015-03-01 23:09:20 -06:00
parent d35388ff43
commit 1cbbd270e7

View File

@ -14,10 +14,14 @@
MLI equ $bf00 MLI equ $bf00
jsr DrawMenu jsr DrawMenu
jsr DrawSelected
jsr WaitKey
jsr GetStartBank jsr GetStartBank
jsr WaitKey jsr WaitKey
Quit jsr MLI ; first actual command, call ProDOS vector Quit jsr MLI ; first actual command, call ProDOS vector
dfb $65 ; with "quit" request ($65) dfb $65 ; with "quit" request ($65)
da QuitParm da QuitParm
@ -136,8 +140,6 @@ DrawMenu jsr HOME
BeginTest brk $ff BeginTest brk $ff
* x=x y=y a=len
MenuHighlight
* DEFAULTS * DEFAULTS
StartBank db #$02 StartBank db #$02
@ -167,7 +169,7 @@ DrawMenuOptions sta $0
beq :hexItem beq :hexItem
cmp #2 cmp #2
beq :jsrItem beq :jsrItem
:charItem :charItem
:hexItem iny :hexItem iny
lda ($0),y ; get len lda ($0),y ; get len
sta _menuHexIdx sta _menuHexIdx
@ -183,18 +185,40 @@ DrawMenuOptions sta $0
iny iny
cpy _menuHexIdx cpy _menuHexIdx
bne :prloop bne :prloop
bra :nextMenuItem
:jsrItem
iny
iny
lda ($0),y
tax
iny
lda ($0),y
tay
lda $0 ; whoops.. save zp ptrs that printstring uses :(
pha
lda $1
pha
txa
jsr PrintString
pla
sta $1
pla
sta $0
:nextMenuItem
lda _menuOptionPtr lda _menuOptionPtr
clc clc
adc #6 ; len of "struct" adc #6 ; len of "struct"
sta _menuOptionPtr sta _menuOptionPtr
bra :drawOption bra :drawOption
:jsrItem
:menuDone :menuDone
rts rts
_menuHexIdx dw 0 _menuHexIdx dw 0
_menuOptionPtr dw 00 _menuOptionPtr dw 00
Menu_ItemSelected db 0
MainMenuDefs MainMenuDefs
Menu_StartBank hex 0D,0A ; x,y Menu_StartBank hex 0D,0A ; x,y
db 01 ; 0=char/1=hex input 2=Menu JSR db 01 ; 0=char/1=hex input 2=Menu JSR
@ -219,8 +243,9 @@ Menu_BeginTest hex 0D,12 ; x,y
MainMenuEnd dw 0000 MainMenuEnd dw 0000
MenuStr_JSR da BeginTest ; MUST PRECEDE MENU STRING! Yes, it's magicly inferred. (-2) MenuStr_JSR da BeginTest ; MUST PRECEDE MENU STRING! Yes, it's magicly inferred. (-2)
MenuStr_BeginTest asc "BEGIN TEST" MenuStr_BeginTest asc "BEGIN TEST",$00,$00
MenuStr_BeginTestL equ #*-MenuStr_BeginTest MenuStr_BeginTestL equ #*-MenuStr_BeginTest
MainMenuStrs MainMenuStrs
@ -243,12 +268,28 @@ MainMenuStrs
hex 00,00 hex 00,00
PrintStringDebug sta $0
sty $1
ldy #0
:loop lda ($0),y
beq :done
jsr COUT
jsr WaitKey
iny
bra :loop
:done rts
WaitKey WaitKey
:kloop lda KEY :kloop lda KEY
bpl :kloop bpl :kloop
sta STROBE sta STROBE
cmp #"b" ; REMOVE DEBUG
bne :nobreak
brk $75
:nobreak
rts rts
put strings.s put strings.s