From 78d4c3eb061624df9efec2fd02c266d17c88884e Mon Sep 17 00:00:00 2001 From: Peter Ferrie Date: Tue, 16 Jan 2018 22:54:25 -0800 Subject: [PATCH 1/2] improve support for The Wizard and the Princess --- src/patchers/sierra13.a | 10 ++++++---- src/strings/en.a | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/patchers/sierra13.a b/src/patchers/sierra13.a index 95d1de5..2465562 100644 --- a/src/patchers/sierra13.a +++ b/src/patchers/sierra13.a @@ -61,19 +61,21 @@ !byte $8D,$8D,$BE ;STA $BE8D pla sec - sbc #$0B + sbc #$0D tax pla - ldy #8 + ldy #10 jsr compare + !byte $A9,$85 ;LDA #$85 !byte $8D,$7D,$BE ;STA $BE7D !byte $A9,$6B ;LDA #$6B !byte $8D,$7E,$BE ;STA $BE7E bcs ++ - ldy #8 + ldy #10 jsr modify + !byte $A9,$A0 ;LDA #$A0 !byte $8D,$8C,$BE ;STA $BE8C - !byte $A9,$6B ;LDA #$6B + !byte $A9,$B9 ;LDA #$B9 !byte $8D,$8D,$BE ;STA $BE8D ++ pla clc diff --git a/src/strings/en.a b/src/strings/en.a index e496055..6df053a 100755 --- a/src/strings/en.a +++ b/src/strings/en.a @@ -138,7 +138,7 @@ StringTable ; can be set directly before calling PrintByID. ; .header - !text "Passport by 4am 2018-01-15",$00 + !text "Passport by 4am 2018-01-16",$00 .mainmenu !text "________________________________________",$8D,$8D,$8D,$8D,$8D,$8D,$8D !text " " From 9123b40282f63dda74ce47e06898c9328d8cafca Mon Sep 17 00:00:00 2001 From: Peter Ferrie Date: Wed, 17 Jan 2018 20:49:28 -0800 Subject: [PATCH 2/2] support The Artist --- src/patchers/sierra.a | 47 +++++++++++++++++++++++++++++++++++++++++++ src/strings/en.a | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/src/patchers/sierra.a b/src/patchers/sierra.a index 991568c..083f6a1 100755 --- a/src/patchers/sierra.a +++ b/src/patchers/sierra.a @@ -26,6 +26,7 @@ ; The Black Cauldron ; The Dark Crystal ; Mixed Up Mother Goose +; The Artist ; ; module by qkumba ;------------------------------- @@ -41,6 +42,25 @@ ldy #$01 jsr modify !byte $2C + + ;there are two of these on the same track + ++ ldy #3 + jsr SearchTrack +.jmp1 + !byte $4C,$D1,$D1 ;JMP $xxxx + bcs + + ldy #$01 + jsr modify + !byte $60 + ldy #3 + jsr SearchTrack +.jmp2 + !byte $4C,$D1,$D1 ;JMP $xxxx + bcs + + ldy #$01 + jsr modify + !byte $60 + ldy #3 jsr SearchTrack .load @@ -194,6 +214,16 @@ ldy #$01 jsr modify !byte $EA ;NOP ++ ldy #7 + jsr SearchTrack + !byte $60 ;encoded NOP + !byte $AA,$AA,$C8 ;encoded JSR $4220 + !byte $4C,$BF,$48 ;JMP $48BF + bcs + + inx + ldy #$01 + jsr modify + !byte $A6 ;encoded BIT + jmp .exit .trybox @@ -404,9 +434,13 @@ patchstyle .page3 lda $D101,x sta .call+1 + sta .jmp1+1 + sta .jmp2+1 .page4 lda $D102,x sta .call+2 + sta .jmp1+2 + sta .jmp2+2 txa adc #9 tax @@ -507,9 +541,13 @@ patchstyle bcs .exit .page8 lda $D109,x + pha .adj adc #$D1 tax + pla + adc #4 + sta .tryalt+1 .cmp6 lda #$D1 pha @@ -518,6 +556,15 @@ patchstyle !byte $A9,$1C ;LDA #$1C !byte $8D ;STA $xxxx pla + bcc .yes + pha +.tryalt + ldx #$D1 + ldy #3 + jsr compare + !byte $A9,$1C ;LDA #$1C + !byte $8D ;STA $xxxx + pla bcs .exit .yes diff --git a/src/strings/en.a b/src/strings/en.a index 6df053a..13e5e31 100755 --- a/src/strings/en.a +++ b/src/strings/en.a @@ -138,7 +138,7 @@ StringTable ; can be set directly before calling PrintByID. ; .header - !text "Passport by 4am 2018-01-16",$00 + !text "Passport by 4am 2018-01-17",$00 .mainmenu !text "________________________________________",$8D,$8D,$8D,$8D,$8D,$8D,$8D !text " "