split MECC ProDOS searches and simplify some code [fixes Miner's Cave]

This commit is contained in:
4am 2021-03-05 11:06:08 -05:00
parent 3cb2f61fa6
commit 22d60cec63
2 changed files with 18 additions and 23 deletions

View File

@ -31,23 +31,30 @@
jsr modify jsr modify
!byte $DE !byte $DE
+ +
ldy #$15 ldy #$0A
jsr SearchTrack jsr SearchTrack
!byte $AD,$C4,$D1,$CD,$C8,$D4,$08,$2C !byte $AD,$C4,$D1
!byte $81,$C0,$28,$D0,$06,$C9,$DE,$F0 !byte $CD,$C8,$D4
!byte $02,$18,$24,$38,$60 !byte $08
bcs + ; passport-test-suite/Mystery Objects v1.1.woz [C=0] matches !byte $2C,$81,$C0
bcs + ; passport-test-suite/Miner's Cave.woz [C=0] matches
ldy #$0B
jsr SearchTrack
!byte $28
!byte $D0,$06
!byte $C9,$DE
!byte $F0,$02
!byte $18
!byte $24,$38
!byte $60
bcs + ; passport-test-suite/Miner's Cave.woz [C=0] matches
sta gDisplayBytes sta gDisplayBytes
tay tay
txa txa
adc #$13 adc #$09
tax tax
tya tya
ldy #$01 ldy #$01
jsr compare
!byte $38
bcs + ; passport-test-suite/Mystery Objects v1.1.woz [C=0] matches
ldy #$01
jsr modify jsr modify
!byte $18 !byte $18
+ +
@ -67,10 +74,6 @@
tax tax
tya tya
ldy #$01 ldy #$01
jsr compare
!byte $38
bcs + ; passport-test-suite/Spelling Press v1.1.woz [C=0] matches
ldy #$01
jsr modify jsr modify
!byte $18 !byte $18
+ +
@ -90,10 +93,6 @@
tax tax
tya tya
ldy #$01 ldy #$01
jsr compare
!byte $38
bcs + ; passport-test-suite/Spelling Press v1.1.woz [C=0] matches
ldy #$01
jsr modify jsr modify
!byte $18 !byte $18
+ +
@ -104,10 +103,6 @@
inx inx
inx inx
ldy #$01 ldy #$01
jsr compare
!byte $38
bcs .exit ; passport-test-suite/Spelling Press v1.1.woz [C=0] matches
ldy #$01
jsr modify jsr modify
!byte $18 !byte $18
.exit .exit

View File

@ -288,7 +288,7 @@ StringTableHigh
; can be set directly before calling PrintByID. ; can be set directly before calling PrintByID.
; ;
.header .header
!text "Passport by 4am 2021-03-02",$00 !text "Passport by 4am 2021-03-05",$00
.mainmenu .mainmenu
!text "________________________________________",$8D,$8D,$8D,$8D,$8D,$8D,$8D,$8D !text "________________________________________",$8D,$8D,$8D,$8D,$8D,$8D,$8D,$8D
!text " " !text " "