prep for release

This commit is contained in:
4am 2024-09-13 11:46:45 -04:00
parent a8c6676549
commit be4bc5d723
8 changed files with 36 additions and 22 deletions

View File

@ -456,7 +456,7 @@ IN THE SOFTWARE.
## History ## History
Unreleased 2024-09-13
- NEW: patchers/t00_jmp600.a - NEW: patchers/t00_jmp600.a
(fixes Wizard of Words, Alphabet Zoo, (fixes Wizard of Words, Alphabet Zoo,
Broadsides) Broadsides)

View File

@ -160,18 +160,18 @@ gb_get_hi:
decrunch: decrunch:
!IF SHOW_PROGRESS_DURING_DECRUNCH = 1 { !IF SHOW_PROGRESS_DURING_DECRUNCH = 1 {
kExoProgressWidth = 23 ; depends on total size, max 38
ldx #(kExoProgressWidth+2) ldx #(kExoProgressWidth+2)
lda #$DF lda #$DF
- sta $0528+(20-(kExoProgressWidth/2))-1, x - sta $0528+(20-(kExoProgressWidth/2))-2, x
sta $05A8+(20-(kExoProgressWidth/2))-1, x sta $05A8+(20-(kExoProgressWidth/2))-2, x
dex dex
bpl - bpl -
lda #$20 lda #$20
sta $05A8+(20-(kExoProgressWidth/2))-1 sta $05A8+(20-(kExoProgressWidth/2))-2
sta $05A8+(20-(kExoProgressWidth/2))+kExoProgressWidth+1 sta $05A8+(20-(kExoProgressWidth/2))+kExoProgressWidth
lda #$A8+(20-(kExoProgressWidth/2)) lda #$A8+(20-(kExoProgressWidth/2))-1
sta ExoProgressPtr+1 sta ExoProgressPtr+1
decrunch_no_reset_progress:
} }
; ------------------------------------------------------------------- ; -------------------------------------------------------------------
; init zeropage, x and y regs. (12 bytes) ; init zeropage, x and y regs. (12 bytes)
@ -243,16 +243,7 @@ no_fixup_lohi:
!ifndef FORWARD_DECRUNCHING { !ifndef FORWARD_DECRUNCHING {
!set FORWARD_DECRUNCHING = 1 !set FORWARD_DECRUNCHING = 1
} }
!if FORWARD_DECRUNCHING = 0 {
literal_start1: literal_start1:
tya
bne no_hi_decr
dec zp_dest_hi
no_hi_decr:
dey
jsr get_crunched_byte
sta (zp_dest_lo),y
!IF SHOW_PROGRESS_DURING_DECRUNCH = 1 { !IF SHOW_PROGRESS_DURING_DECRUNCH = 1 {
dec ExoProgressCounter dec ExoProgressCounter
bne + bne +
@ -262,9 +253,15 @@ ExoProgressPtr
inc ExoProgressPtr+1 inc ExoProgressPtr+1
+ +
} }
!if FORWARD_DECRUNCHING = 0 {
tya
bne no_hi_decr
dec zp_dest_hi
no_hi_decr:
dey
jsr get_crunched_byte
sta (zp_dest_lo),y
} else { } else {
literal_start1:
jsr get_crunched_byte jsr get_crunched_byte
sta (zp_dest_lo),y sta (zp_dest_lo),y
iny iny

View File

@ -20,7 +20,7 @@
!byte $01,$A2,$00,$BD,$00,$08,$9D,$00 !byte $01,$A2,$00,$BD,$00,$08,$9D,$00
!byte $02,$E8,$D0,$F7,$4C,$0F,$02,$A9 !byte $02,$E8,$D0,$F7,$4C,$0F,$02,$A9
!byte $A0 !byte $A0
; passport-test-suite/Competition Karate.woz [C=0] matches ; passport-test-suite/J-Bird.woz [C=0] matches
} }
FoundJMP600 FoundJMP600

View File

@ -188,8 +188,19 @@ TraceDOS32d
ldy #$04 ; at RWTS entry point ldy #$04 ; at RWTS entry point
jsr CompareMemory ; (e.g. $BD00 or $3D00) jsr CompareMemory ; (e.g. $BD00 or $3D00)
!byte $84,$48,$85,$49 !byte $84,$48,$85,$49
bcc .RWTSEntryOK
jsr CompareMemory
!byte $84,$10,$85,$11 ; variant used by Micro-Labs
bcs .fail bcs .fail
lda #$D6
sta $48
lda #$B5
sta $D6
bne .patchmap ; always branches
.RWTSEntryOK
lda #$FA lda #$FA
sta modsrc sta modsrc
lda jCallRWTS+2 lda jCallRWTS+2

View File

@ -453,7 +453,7 @@ inx4 inx
universalrwts universalrwts
!bin "../build/universalrwts.pak" !bin "../build/universalrwts.pak"
!source "exodecrunch.s" !source "exodecrunch.a"
get_crunched_byte: get_crunched_byte:
_byte_lo = * + 1 _byte_lo = * + 1

View File

@ -5,7 +5,12 @@
; and jump to a third RWTS at $B700 ; and jump to a third RWTS at $B700
; ;
; tested on ; tested on
; - Alphabet Zoo v1.0 (Spinnaker)
; - Broadsides (SSI) [several variants]
; - Dinosaurs v1.0 (Advanced Ideas) ; - Dinosaurs v1.0 (Advanced Ideas)
; - Fortress (SSI)
; - Fraction Fever (Spinnaker)
; - J-Bird (Orion)
; - Wizard of Words v1.0 (Advanced Ideas) ; - Wizard of Words v1.0 (Advanced Ideas)
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; ;

View File

@ -387,7 +387,7 @@ StringTableHigh ; must be kept in sync with constants in enid.a
.passport .passport
!text "Passport ",$00 !text "Passport ",$00
.header .header
!text "@",s_passport,"by 4am@",s_space7,"@",s_space7," 2024-05-14",$00 !text "@",s_passport,"by 4am@",s_space7,"@",s_space7," 2024-09-13",$00
.bar9 .bar9
!text "_________",$00 !text "_________",$00
.bar18 .bar18

View File

@ -88,8 +88,9 @@ OneTimeSetup
!source "hw.harddisk.a" !source "hw.harddisk.a"
SHOW_PROGRESS_DURING_DECRUNCH = 1 ; activates optional UI code in exodecrunch SHOW_PROGRESS_DURING_DECRUNCH = 1 ; activates optional UI code in exodecrunch
kExoProgressWidth = 23 ; depends on total size, max 38
!source "exodecrunch.s" !source "exodecrunch.a"
get_crunched_byte get_crunched_byte
lda _byte_lo lda _byte_lo