Apple-2-SW/passport
1
0
Fork 0
mirror of https://github.com/a2-4am/passport.git synced 2024-11-19 03:06:34 +00:00
Code Issues Projects Releases Wiki Activity

fixes for MECC Database Composer's multiple layers of RWTS swappers

Browse Source
This commit is contained in:
4am 2021-02-28 21:01:35 -05:00
parent 9fd7e03572
commit efcfdd8aa2
7 changed files with 105 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/passport.a
View File

@ -792,6 +792,7 @@ _applyToAll
!source "patchers/bbf9.a" ; gIsProDOS only !source "patchers/bbf9.a" ; gIsProDOS only
!source "patchers/memory.config.a" ; gIsProDOS only !source "patchers/memory.config.a" ; gIsProDOS only
!source "patchers/origin.a" ; gIsProDOS only !source "patchers/origin.a" ; gIsProDOS only
!source "patchers/meccdbc.a" ; gMECCFastloadType==1 && gT07 only
!source "patchers/rwtsswapmecc.a" ; gMECCFastloadType only !source "patchers/rwtsswapmecc.a" ; gMECCFastloadType only
!source "patchers/rwtsswapmecc2.a" ; gPossibleMECCSwapper only !source "patchers/rwtsswapmecc2.a" ; gPossibleMECCSwapper only
!source "patchers/rwtsswappenguin.a" ; T01 only !source "patchers/rwtsswappenguin.a" ; T01 only
@ -842,6 +843,15 @@ _applyToAll
sec ; set carry if nothing happened sec ; set carry if nothing happened
rts rts
inx6 inx
inx5 inx
inx4 inx
inx
inx
inx
rts
universalrwts universalrwts
!bin "../build/universalrwts.pak" !bin "../build/universalrwts.pak"
!source "exodecrunch.s" !source "exodecrunch.s"
@ -849,13 +859,13 @@ universalrwts
get_crunched_byte: get_crunched_byte:
_byte_lo = * + 1 _byte_lo = * + 1
_byte_hi = * + 2 _byte_hi = * + 2
lda $1234 ; needs to be set correctly before lda $1234 ; needs to be set correctly before
; decrunch_file is called. ; decrunch_file is called.
inc _byte_lo inc _byte_lo
bne _byte_skip_hi bne _byte_skip_hi
inc _byte_hi inc _byte_hi
_byte_skip_hi: _byte_skip_hi:
rts rts
AnalyzeT00 ; placeholder to identify stack of packed data AnalyzeT00 ; placeholder to identify stack of packed data
!bin "../build/t00only.pak" !bin "../build/t00only.pak"

38
src/patchers/ea.a
View File

@ -87,11 +87,7 @@
!byte $03,$4C ;LDI #$00 !byte $03,$4C ;LDI #$00
!byte $04,$EB,$19 ;LDA $c0e8 !byte $04,$EB,$19 ;LDA $c0e8
bcs + bcs +
inx jsr inx5
inx
inx
inx
inx
ldy #1 ldy #1
jsr modify jsr modify
!byte $04 !byte $04
@ -113,12 +109,7 @@
!byte $D0,$A7 ;BNE -$A7 !byte $D0,$A7 ;BNE -$A7
!byte $4C ;JMP $xxxx !byte $4C ;JMP $xxxx
bcs + bcs +
inx jsr inx6
inx
inx
inx
inx
inx
ldy #1 ldy #1
jsr modify jsr modify
!byte $00 ;disable branch !byte $00 ;disable branch
@ -210,11 +201,7 @@
lda #s_tamper lda #s_tamper
jsr PrintByID jsr PrintByID
pla pla
inx jsr inx5
inx
inx
inx
inx
ldy #1 ldy #1
jsr modify jsr modify
!byte $00 ;new checksum value for cmp !byte $00 ;new checksum value for cmp
@ -231,12 +218,7 @@
lda #s_tamper lda #s_tamper
jsr PrintByID jsr PrintByID
pla pla
inx jsr inx6
inx
inx
inx
inx
inx
ldy #1 ldy #1
jsr modify jsr modify
!byte $50 ;new checksum value for cmp !byte $50 ;new checksum value for cmp
@ -252,10 +234,7 @@
lda #s_tamper lda #s_tamper
jsr PrintByID jsr PrintByID
pla pla
inx jsr inx4
inx
inx
inx
ldy #1 ldy #1
jsr modify jsr modify
!byte $50 ;new checksum value for cmp !byte $50 ;new checksum value for cmp
@ -267,12 +246,7 @@
!byte $20,$00,$61 ;JSR $6100 !byte $20,$00,$61 ;JSR $6100
!byte $4C,$94,$69 ;JMP $6994 !byte $4C,$94,$69 ;JMP $6994
bcs + bcs +
inx jsr inx6
inx
inx
inx
inx
inx
ldy #1 ldy #1
jsr modify jsr modify
!byte $2C ;JSR->BIT !byte $2C ;JSR->BIT

64
src/patchers/meccdbc.a Normal file
View File

@ -0,0 +1,64 @@
;-------------------------------
; #MECCDBC
;-------------------------------
!zone {
bit gMode ; nothing to do here in verify-only mode
bpl .jmpexit
lda gTrack
cmp #7
bne .jmpexit
lda gMECCFastloadType
cmp #ID_MECC1
bne .jmpexit
asl
asl
asl
sta tmp
asl
adc tmp
ldx #8
- pha
tay
txa
pha
lda .table+2-24,y
sta .cmpbyte
sta .modbyte
lda .table-24,y
ldx .table+1-24,y
ldy #$01
jsr compare
.cmpbyte
!byte $D1 ; SMC
bcc +
ldy #$01
jsr modify
.modbyte
!byte $D1 ; SMC
+ pla
tax
pla
tay
iny
iny
iny
tya
dex
bne -
.jmpexit
jmp .exit
.table
!byte $0B,$08,$D5
!byte $0B,$12,$AA
!byte $0B,$1D,$96
!byte $0B,$8F,$D5
!byte $0B,$99,$AA
!byte $0B,$A3,$AD
!byte $0C,$82,$AA
!byte $0C,$87,$AD
.exit
}

13
src/patchers/rwtsswapmecc.a
View File

@ -9,6 +9,19 @@
lda gMECCFastloadType lda gMECCFastloadType
beq .exit beq .exit
ldy #$08
jsr SearchTrack
!byte $A0,$02
!byte $AD,$88,$67
!byte $D0,$11
!byte $B9
bcs + ; passport-test-suite/MECC Dataquest Composer [C=0] matches
sta gDisplayBytes
jsr inx5
ldy #$01
jsr modify
!byte $24
+
ldy #$11 ldy #$11
jsr SearchTrack jsr SearchTrack
!byte $0A !byte $0A

6
src/patchers/rwtsswapmecc2.a
View File

@ -17,11 +17,7 @@
!byte $8D,$7A,$BC !byte $8D,$7A,$BC
bcs .exit ; passport-test-suite/Word Wizards v1.0.woz [C=0] matches bcs .exit ; passport-test-suite/Word Wizards v1.0.woz [C=0] matches
sta gDisplayBytes sta gDisplayBytes
inx jsr inx5
inx
inx
inx
inx
ldy #$01 ldy #$01
jsr modify jsr modify
!byte $60 !byte $60

21
src/patchers/sierra.a
View File

@ -127,10 +127,7 @@
bcs + bcs +
pha pha
tay tay
inx jsr inx5
inx
inx
inx
txa txa
pha pha
tya tya
@ -183,11 +180,7 @@
!byte $28 ;PLP !byte $28 ;PLP
!byte $6C,$36,$00 ;JMP ($0036) !byte $6C,$36,$00 ;JMP ($0036)
bcs + bcs +
inx jsr inx5
inx
inx
inx
inx
ldy #$01 ldy #$01
jsr modify jsr modify
!byte $2C ;BIT $xxxx !byte $2C ;BIT $xxxx
@ -213,10 +206,7 @@
ldy #$01 ldy #$01
jsr modify jsr modify
!byte $EA ;NOP !byte $EA ;NOP
inx jsr inx4
inx
inx
inx
ldy #$01 ldy #$01
jsr modify jsr modify
!byte $EA ;NOP !byte $EA ;NOP
@ -296,10 +286,7 @@
!byte $A9,$00 ;LDA #$00 !byte $A9,$00 ;LDA #$00
!byte $85,$48 ;STA $48 !byte $85,$48 ;STA $48
!byte $BD,$89,$C0 ;LDA $C089,X !byte $BD,$89,$C0 ;LDA $C089,X
inx jsr inx4
inx
inx
inx
bcs ++ bcs ++
+ sta gDisplayBytes + sta gDisplayBytes
pha pha

2
src/strings/en.a
View File

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