diff --git a/Atari/display_static.asm b/Atari/display_static.asm index 5862ef4..3b92e4d 100644 --- a/Atari/display_static.asm +++ b/Atari/display_static.asm @@ -9,7 +9,7 @@ OptionsScreen dta d"Welcome to Scorch v. " build ; 4 bytes from scorch.asm (fancy method) :) - dta d" (un)2000-2024" + dta d" (un)2000-2025" .IF TARGET = 800 dta d" Please select option with " diff --git a/Atari/interrupts.asm b/Atari/interrupts.asm index 0d5db93..ec120ed 100644 --- a/Atari/interrupts.asm +++ b/Atari/interrupts.asm @@ -336,6 +336,8 @@ StartPressed jsr _SetDLIproc .endm .proc _SetDLIproc + LDA #$00 + STA NMIEN LDA #$C0 STY VDSLST STX VDSLST+1 diff --git a/Atari/lib/MACRO.ASM b/Atari/lib/MACRO.ASM index 1ce890a..8e8b028 100644 --- a/Atari/lib/MACRO.ASM +++ b/Atari/lib/MACRO.ASM @@ -44,9 +44,11 @@ .MACRO VDLI ; VDLI #WORD ; Initialises Display List Interrupts + LDA #$00 + STA NMIEN + LDA #$C0 LDY # <:1 LDX # >:1 - LDA #$C0 STY $0200 STX $0201 STA NMIEN diff --git a/README.md b/README.md index d5d6f17..e3ed1d9 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,16 @@ With the advent of [fujinet](https://fujinet.online/) we are thinking about maki ## Changelog: +###### Version 1.52 +2025-01-20 + +Fixes for extremely rare bugs. + +1. Better keyboard handling (thanks Gorgh). + +2. Very rare interrupts problem fixed. + + ###### Version 1.51 2025-01-15 diff --git a/artwork/sfx/rmtplayr_modified.asm b/artwork/sfx/rmtplayr_modified.asm index 0ba35d0..a677171 100644 --- a/artwork/sfx/rmtplayr_modified.asm +++ b/artwork/sfx/rmtplayr_modified.asm @@ -156,20 +156,11 @@ rmt_init stx ns sty ns+1 pha -; IFT track_endvariables-track_variables>255 -; ldy #0 -; tya -;ri0 sta track_variables,y -; sta track_endvariables-$100,y -; iny -; bne ri0 -; ELS ldy #track_endvariables-track_variables lda #0 ri0 sta track_variables-1,y dey bne ri0 -; EIF ldy #4 lda (ns),y sta v_maxtracklen @@ -202,10 +193,13 @@ ri1 lda (ns),y rmt_silence lda #0 sta $d208 + sta $d208+$10 ldy #3 sty $d20f + sty $d20f+$10 ldy #8 si1 sta $d200,y + sta $d200+$10,y dey bpl si1 lda #FEAT_INSTRSPEED @@ -611,9 +605,9 @@ qq2a ora #2 tax qq3 - cpx v_audctl - bne qq5 -qq5 +; cpx v_audctl +; bne qq5 +;qq5 stx v_audctl rmt_p5 ; lda v_ainstrspeed diff --git a/constants.asm b/constants.asm index fca098d..44756d7 100644 --- a/constants.asm +++ b/constants.asm @@ -679,7 +679,7 @@ CreditsEnd .IF TARGET = 5200 ; Atari 5200 splash NewSplashText=* - dta d" 2024 atariage", $4e, "com " ; $4e - non blinking dot + dta d" 2025 atariage", $4e, "com " ; $4e - non blinking dot .ENDIF .endif ; .IF *>0 diff --git a/scorch.asm b/scorch.asm index c401730..4d71a95 100644 --- a/scorch.asm +++ b/scorch.asm @@ -41,7 +41,7 @@ ;--------------------------------------------------- .macro build - dta d"1.51" ; number of this build (4 bytes) + dta d"1.52" ; number of this build (4 bytes) .endm .macro RMTSong diff --git a/scorch.bin b/scorch.bin index 488fc58..1f264ea 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.car b/scorch.car index 3621b76..9778fe7 100644 Binary files a/scorch.car and b/scorch.car differ diff --git a/scorch.xex b/scorch.xex index 3c51683..0a6b7be 100644 Binary files a/scorch.xex and b/scorch.xex differ diff --git a/scorch_cart.xex b/scorch_cart.xex index 333ad67..804c74f 100644 Binary files a/scorch_cart.xex and b/scorch_cart.xex differ diff --git a/scorch_fl.atr b/scorch_fl.atr index e9555a5..c1e0735 100644 Binary files a/scorch_fl.atr and b/scorch_fl.atr differ