diff --git a/src/patchers/a5count.a b/src/patchers/a5count.a index b63d8da..a3931be 100644 --- a/src/patchers/a5count.a +++ b/src/patchers/a5count.a @@ -11,8 +11,11 @@ _a5count ldy #$0A jsr SearchTrack - !byte $07,$E6,$02,$D0,$03,$4C,$A5,$00 - !byte $C9,$A5 + !byte $07 + !byte $E6,$02 ; INC $02 + !byte $D0,$03 ; BNE +3 + !byte $4C,$A5,$00; JMP $00A5 + !byte $C9,$A5 ; CMP #$A5 bcs .exit sta gDisplayBytes pha @@ -25,6 +28,6 @@ _a5count pla ldy #$02 jsr modify - !byte $D0,$7B + !byte $D0,$7B ; BNE +$7B .exit } diff --git a/src/patchers/a6bc95.a b/src/patchers/a6bc95.a index 89dfc76..1a7992c 100755 --- a/src/patchers/a6bc95.a +++ b/src/patchers/a6bc95.a @@ -10,23 +10,32 @@ _a6bc95 ldy #$09 jsr SearchTrack - !byte $BD,$8C,$C0,$10,$FB,$C9,$A6,$D0 - !byte $ED + !byte $BD,$8C,$C0; LDA $C08C,X + !byte $10,$FB ; BPL -$FB + !byte $C9,$A6 ; CMP #$A6 + !byte $D0,$ED ; BNE -$ED bcs .exit ldy #$09 jsr SearchTrack - !byte $BD,$8C,$C0,$10,$FB,$C9,$BC,$D0 - !byte $E4 + !byte $BD,$8C,$C0; LDA $C08C,X + !byte $10,$FB ; BPL -$FB + !byte $C9,$BC ; CMP #$BC + !byte $D0,$E4 ; BNE -$E4 bcs .exit ldy #$09 jsr SearchTrack - !byte $BD,$8C,$C0,$10,$FB,$C9,$95,$D0 - !byte $DB + !byte $BD,$8C,$C0; LDA $C08C,X + !byte $10,$FB ; BPL -$FB + !byte $C9,$95 ; CMP #$95 + !byte $D0,$DB ; BNE -$DB bcs .exit ldy #$0E jsr SearchTrack - !byte $AE,$F8,$01,$A9,$0A,$8D,$FE,$01 - !byte $BD,$8E,$C0,$BD,$89,$C0 + !byte $AE,$F8,$01; LDX $01F8 + !byte $A9,$0A ; LDA #$0A + !byte $8D,$FE,$01; STA $01FE + !byte $BD,$8E,$C0; LDA $C08E,X + !byte $BD,$89,$C0; LDA $C089,X bcs .exit sta gDisplayBytes pha @@ -35,6 +44,6 @@ _a6bc95 pla ldy #$01 jsr modify - !byte $60 + !byte $60 ; RTS .exit } diff --git a/src/patchers/bademu.a b/src/patchers/bademu.a index a3800b5..791b403 100755 --- a/src/patchers/bademu.a +++ b/src/patchers/bademu.a @@ -16,14 +16,19 @@ _bademu ldx #$4F ldy #$11 jsr compare ; and T00,S03,$4F == - !byte $BD,$8C,$C0,$10,$FB,$C9,$D5,$D0 - !byte $F0,$EA,$BD,$8C,$C0,$C9,$D5,$F0 - !byte $12 + !byte $BD,$8C,$C0; LDA $C08C,X + !byte $10,$FB ; BPL -$FB + !byte $C9,$D5 ; CMP #$D5 + !byte $D0,$F0 ; BNE -$F0 + !byte $EA ; NOP + !byte $BD,$8C,$C0; LDA $C08C,X + !byte $C9,$D5 ; CMP #$D5 + !byte $F0,$12 ; BEQ +$12 bcs .exit lda #$03 ldx #$58 ldy #$02 - jsr modify ; and set T00,S03,$58 = - !byte $F0,06 + jsr modify ; then set T00,S03,$58 = + !byte $F0,06 ; BEQ +$06 .exit } diff --git a/src/patchers/bademu2.a b/src/patchers/bademu2.a index 815b398..feb88e5 100755 --- a/src/patchers/bademu2.a +++ b/src/patchers/bademu2.a @@ -16,14 +16,19 @@ _bademu2 ldx #$4F ldy #$11 jsr compare ; and T00,S03,$4F == - !byte $BD,$8C,$C0,$10,$FB,$4A,$C9,$6A - !byte $D0,$EF,$BD,$8C,$C0,$C9,$D5,$F0 - !byte $12 + !byte $BD,$8C,$C0; LDA $C08C,X + !byte $10,$FB ; BPL -$FB + !byte $4A ; LSR + !byte $C9,$6A ; CMP #$6A + !byte $D0,$EF ; BNE -$EF + !byte $BD,$8C,$C0; LDA $C08C,X + !byte $C9,$D5 ; CMP #$D5 + !byte $F0,$12 ; BEQ +$12 bcs .exit lda #$03 ldx #$59 ldy #$02 - jsr modify ; and set T00,S03,$59 = - !byte $F0,$05 + jsr modify ; then set T00,S03,$59 = + !byte $F0,$05 ; BEQ +$05 .exit } diff --git a/src/patchers/border.a b/src/patchers/border.a index 9d30112..3d23874 100644 --- a/src/patchers/border.a +++ b/src/patchers/border.a @@ -16,7 +16,12 @@ _border ldx #$5A ldy #$0A jsr compare ; and T00,S08,$5A == - !byte $C9,$23,$B0,$EB,$0A,$20,$6C,$BF,$EA,$EA + !byte $C9,$23 ; CMP #$23 + !byte $B0,$EB ; BCS -$EB + !byte $0A ; ASL + !byte $20,$6C,$BF; JSR $BF6C + !byte $EA ; NOP + !byte $EA ; NOP bcs .exit sta gDisplayBytes pha @@ -25,6 +30,12 @@ _border pla ldy #$0A jsr modify ; then set T00,S08,$5A = - !byte $48,$A0,$01,$B1,$3C,$6A,$68,$90,$08,$0A + !byte $48 ; PHA + !byte $A0,$01 ; LDY #$01 + !byte $B1,$3C ; LDA ($3C),Y + !byte $6A ; ROR + !byte $68 ; PLA + !byte $90,$08 ; BCC +$08 + !byte $0A ; ASL .exit } diff --git a/src/patchers/c9ff.a b/src/patchers/c9ff.a index 907a150..7981ef1 100644 --- a/src/patchers/c9ff.a +++ b/src/patchers/c9ff.a @@ -16,10 +16,21 @@ _c9ff ldy #$1A jsr SearchTrack - !byte $A8,$D0,$15,$BD,$8C,$C0,$10,$FB - !byte $C9,$FF,$D0,$0C,$EA,$BD,$8C,$C0 - !byte $10,$FB,$C9,$FF,$D0,$02,$18,$60 - !byte $38,$60 + !byte $A8 ; TAY + !byte $D0,$15 ; BNE +$15 + !byte $BD,$8C,$C0; LDA $C08C,X + !byte $10,$FB ; BPL -$FB + !byte $C9,$FF ; CMP #$FF + !byte $D0,$0C ; BNE +$0C + !byte $EA ; NOP + !byte $BD,$8C,$C0; LDA $C08C,X + !byte $10,$FB ; BPL -$FB + !byte $C9,$FF ; CMP #$FF + !byte $D0,$02 ; BNE +$02 + !byte $18 ; CLC + !byte $60 ; RTS + !byte $38 ; SEC + !byte $60 ; RTS bcs .exit sta gDisplayBytes pha diff --git a/src/patchers/corrupter.a b/src/patchers/corrupter.a index 4ed060a..006230f 100644 --- a/src/patchers/corrupter.a +++ b/src/patchers/corrupter.a @@ -11,19 +11,30 @@ corrupter ldx #$2C ldy #$07 jsr compare - !byte $20,$E3,$03,$84,$00,$85,$01 + !byte $20,$E3,$03; JSR $03E3 + !byte $84,$00 ; STY $00 + !byte $85,$01 ; STA $01 bcs .nextsector ldx #$D4 ldy #$0F jsr compare - !byte $A9,$00,$8D,$00,$A0,$EE,$D3,$40 - !byte $AD,$D3,$40,$C9,$FF,$D0,$F1 + !byte $A9,$00 ; LDA #$00 + !byte $8D,$00,$A0; STA $4000 + !byte $EE,$D3,$40; INC $40D3 + !byte $AD,$D3,$40; LDA $40D3 + !byte $C9,$FF ; CMP #$FF + !byte $D0,$F1 ; BNE -$F1 bcs .nextsector ldx #$A4 ldy #$0F jsr compare - !byte $A9,$23,$85,$02,$A9,$00,$85,$03 - !byte $A9,$01,$85,$04,$20,$28,$40 + !byte $A9,$23 ; LDA #$23 + !byte $85,$02 ; STA $02 + !byte $A9,$00 ; LDA #$00 + !byte $85,$03 ; STA $03 + !byte $A9,$01 ; LDA #$01 + !byte $85,$04 ; STA $04 + !byte $20,$28,$40; JSR $4028 bcs .nextsector sta gDisplayBytes pha @@ -32,7 +43,7 @@ corrupter pla ldy #$01 jsr modify - !byte $60 + !byte $60 ; RTS .nextsector dec .sector+1 bpl .sector diff --git a/src/patchers/d5d5f7.a b/src/patchers/d5d5f7.a index 5eaec42..5cd4297 100755 --- a/src/patchers/d5d5f7.a +++ b/src/patchers/d5d5f7.a @@ -9,10 +9,23 @@ _d5d5f7 ldy #$20 jsr SearchTrack - !byte $BD,$8C,$C0,$10,$FB,$48,$68,$C9 - !byte $D5,$D0,$F5,$A0,$00,$8C,$97,$97 - !byte $BD,$8C,$C0,$10,$FB,$C9,$D5,$F0 - !byte $0F,$C9,$F7,$D0,$01,$C8,$18,$6D + !byte $BD,$8C,$C0; LDA $C08C,X + !byte $10,$FB ; BPL -$FB + !byte $48 ; PHA + !byte $68 ; PLA + !byte $C9,$D5 ; CMP #$D5 + !byte $D0,$F5 ; BNE -$F5 + !byte $A0,$00 ; LDY #00 + !byte $8C,WILDCARD,WILDCARD; STY $xxxx + !byte $BD,$8C,$C0; LDA $C08C,X + !byte $10,$FB ; BPL -$FB + !byte $C9,$D5 ; CMP #$D5 + !byte $F0,$0F ; BEQ +$0F + !byte $C9,$F7 ; CMP #$F7 + !byte $D0,$01 ; BNE +$01 + !byte $C8 ; INY + !byte $18 ; CLC + !byte $6D ; ADC bcs .exit sta gDisplayBytes pha @@ -21,6 +34,6 @@ _d5d5f7 pla ldy #$01 jsr modify - !byte $60 + !byte $60 ; RTS .exit }