version bump and code cleanup
This commit is contained in:
parent
8ab37e4264
commit
df8b4444b8
78
src/misc.s
78
src/misc.s
|
@ -33,69 +33,31 @@ ToLower cmp #"Z"
|
||||||
|
|
||||||
|
|
||||||
mx %11
|
mx %11
|
||||||
ColorizeMenu
|
ColorizeMenu sei
|
||||||
lda #6
|
XSCANLINE #$6;#$A0 ;lt grey
|
||||||
ldx #$A0 ; lt gray
|
XSCANLINE #$7;#$C0 ;grn
|
||||||
jsr WaitScanline
|
XSCANLINE #$8;#$D0 ;yello
|
||||||
|
XSCANLINE #$A;#$90 ;orange
|
||||||
lda #7
|
XSCANLINE #$B;#$10 ;red
|
||||||
ldx #$A0 ; lt gray
|
XSCANLINE #$C;#$30 ;purple
|
||||||
jsr WaitScanline
|
XSCANLINE #$E;#$70 ;blue
|
||||||
|
XSCANLINE #$F;#$50 ;grey
|
||||||
lda #8
|
XSCANLINE #$10;#$F0 ;white
|
||||||
ldx #$C0 ; green
|
cli
|
||||||
jsr WaitScanline
|
|
||||||
|
|
||||||
lda #9
|
|
||||||
ldx #$C0 ; green
|
|
||||||
jsr WaitScanline
|
|
||||||
|
|
||||||
lda #10
|
|
||||||
ldx #$C0 ; green
|
|
||||||
jsr WaitScanline
|
|
||||||
|
|
||||||
lda #11
|
|
||||||
ldx #$d0 ; yello
|
|
||||||
jsr WaitScanline
|
|
||||||
|
|
||||||
lda #12
|
|
||||||
ldx #$90 ; orange
|
|
||||||
jsr WaitScanline
|
|
||||||
|
|
||||||
lda #13
|
|
||||||
ldx #$10 ; red
|
|
||||||
jsr WaitScanline
|
|
||||||
|
|
||||||
lda #14
|
|
||||||
ldx #$30 ; purple
|
|
||||||
jsr WaitScanline
|
|
||||||
|
|
||||||
|
|
||||||
lda #15
|
|
||||||
ldx #$70 ; bblue
|
|
||||||
jsr WaitScanline
|
|
||||||
|
|
||||||
lda #16
|
|
||||||
ldx #$50 ; grey
|
|
||||||
jsr WaitScanline
|
|
||||||
|
|
||||||
lda #17
|
|
||||||
ldx #$f0 ; white
|
|
||||||
jsr WaitScanline
|
|
||||||
rts
|
rts
|
||||||
|
|
||||||
* now stores x immediately
|
* I think this still has latent issues with a desync'ed bit 0 (race condition)
|
||||||
WaitScanline
|
XSCANLINE MAC
|
||||||
sta :val+1
|
ldx #]2
|
||||||
|
:waitloop lda $c02f
|
||||||
:waitloop ldal $e0c02f
|
|
||||||
asl
|
asl
|
||||||
ldal $e0c02e
|
lda $c02e
|
||||||
rol
|
rol
|
||||||
:val cmp #$00
|
:val cmp #]1
|
||||||
bne :waitloop
|
bne :waitloop
|
||||||
stx $c022
|
stx $c022
|
||||||
rts
|
<<<
|
||||||
|
|
||||||
|
|
||||||
VBlankForce
|
VBlankForce
|
||||||
:vbl ldal $00c019
|
:vbl ldal $00c019
|
||||||
|
@ -121,7 +83,7 @@ WaitSCB sta :val+1
|
||||||
; horizcnt even/odd right as it changes
|
; horizcnt even/odd right as it changes
|
||||||
; and start early or something?
|
; and start early or something?
|
||||||
rts
|
rts
|
||||||
MAXSCB db 0
|
|
||||||
|
|
||||||
|
|
||||||
WaitSome ldy #$07
|
WaitSome ldy #$07
|
||||||
|
|
23
src/mmt.s
23
src/mmt.s
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
org $2000 ; start at $2000 (all ProDOS8 system files)
|
org $2000 ; start at $2000 (all ProDOS8 system files)
|
||||||
typ $ff ; set P8 type ($ff = "SYS") for output file
|
typ $ff ; set P8 type ($ff = "SYS") for output file
|
||||||
dsk mmtsystem ; tell compiler what name for output file
|
dsk mmt.system ; tell compiler what name for output file
|
||||||
put applerom
|
put applerom
|
||||||
|
|
||||||
Init
|
Init
|
||||||
|
@ -452,15 +452,6 @@ TestLogError PushAll
|
||||||
*Mesg_Error0 asc "Wrote: $00 %12345678 Read: $00 %12345678"
|
*Mesg_Error0 asc "Wrote: $00 %12345678 Read: $00 %12345678"
|
||||||
|
|
||||||
|
|
||||||
TestRollBack
|
|
||||||
lda TestDirection
|
|
||||||
eor #$01
|
|
||||||
sta TestDirection
|
|
||||||
jsr TestAdvanceLocation
|
|
||||||
lda TestDirection
|
|
||||||
eor #$01
|
|
||||||
sta TestDirection
|
|
||||||
rts
|
|
||||||
|
|
||||||
TestForceUpdateStatus PushAll
|
TestForceUpdateStatus PushAll
|
||||||
stx _stash
|
stx _stash
|
||||||
|
@ -595,7 +586,7 @@ TestMemoryLocationTwoPass
|
||||||
bne :UNHANDLED
|
bne :UNHANDLED
|
||||||
jmp Test_16BitWalk1TP
|
jmp Test_16BitWalk1TP
|
||||||
|
|
||||||
:UNHANDLED sep #$30
|
:UNHANDLED sep #$30 ; @todo: what is this?
|
||||||
rep #$10
|
rep #$10
|
||||||
|
|
||||||
rts
|
rts
|
||||||
|
@ -774,7 +765,7 @@ BANKPATCH12 = *-1
|
||||||
|
|
||||||
PushAll
|
PushAll
|
||||||
sep #$20
|
sep #$20
|
||||||
jsr CORRUPTOR
|
jsr CORRUPTOR ; @todo: inline
|
||||||
clc
|
clc
|
||||||
xce
|
xce
|
||||||
rep #$30
|
rep #$30
|
||||||
|
@ -1314,9 +1305,9 @@ TESTSTATE_WRITE = 2
|
||||||
TESTSTATE_BOTH = 3
|
TESTSTATE_BOTH = 3
|
||||||
UpdateScanInterval equ #$1000
|
UpdateScanInterval equ #$1000
|
||||||
|
|
||||||
Mesg_Welcome asc "Mini Memory Tester v1.0.1 - Copyright (c) 2015-2018 Dagen Brock",00
|
Mesg_Welcome asc "Mini Memory Tester v1.0.2 - Copyright (c) 2015-2021 Dagen Brock",00
|
||||||
Mesg_Promo asc "Visit ReactiveMicro.com & UltimateApple2.com for Apple II RAM cards & more!",$8D,$8D
|
Mesg_Promo asc "Visit ReactiveMicro.com & UltimateApple2.com for Apple II RAM cards & hw.",$8D,$8D
|
||||||
asc " Full manual and latest version available at github.com/digarok/mmt",00
|
asc "Full manual and latest version available at github.com/digarok/mmt",00
|
||||||
Mesg_InternalRam256 asc "Built-In RAM 256K",00
|
Mesg_InternalRam256 asc "Built-In RAM 256K",00
|
||||||
Mesg_InternalRam1024 asc "Built-In RAM 1024K",00
|
Mesg_InternalRam1024 asc "Built-In RAM 1024K",00
|
||||||
Mesg_ExpansionRam asc "Expansion RAM ",00
|
Mesg_ExpansionRam asc "Expansion RAM ",00
|
||||||
|
@ -1749,7 +1740,7 @@ _clearstring asc " ",$00
|
||||||
|
|
||||||
MainMenuStrs
|
MainMenuStrs
|
||||||
asc " ______________________________________________________________________________",$8D,$00
|
asc " ______________________________________________________________________________",$8D,$00
|
||||||
asc $1B,'ZV_@ZVWVWVWV_',"Mini Memory Tester v1.0.1",'ZVWVWVWVWVWVWVWVWV_'," // Infinitum ",'ZWVWVWVW_',$18,$00
|
asc $1B,'ZV_@ZVWVWVWV_',"Mini Memory Tester v1.0.2",'ZVWVWVWVWVWVWVWVWV_'," // Infinitum ",'ZWVWVWVW_',$18,$00
|
||||||
asc $1B,'ZLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL_',$18,00
|
asc $1B,'ZLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL_',$18,00
|
||||||
asc $1B,'ZZ \GGGGGGGGGGGGG_',"Test Settings",'ZGGGGGGGGGGGGG\ _'," ",'Z \GGGGGGGG_',"Info",'ZGGGGGGGG\ _'," ",'_',$18,00
|
asc $1B,'ZZ \GGGGGGGGGGGGG_',"Test Settings",'ZGGGGGGGGGGGGG\ _'," ",'Z \GGGGGGGG_',"Info",'ZGGGGGGGG\ _'," ",'_',$18,00
|
||||||
asc $1B,'ZZ'," ",'_'," ",'Z'," ",'_'," ",'_',$18,00
|
asc $1B,'ZZ'," ",'_'," ",'Z'," ",'_'," ",'_',$18,00
|
||||||
|
|
Loading…
Reference in New Issue