Merge pull request #172 from pkali/develop

v1.52

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 "

Atari/inputs.asm

@@ -23,10 +23,8 @@ getKeyAfterWait
 ;--------------------------------------------------
     .IF TARGET = 800
       lda SKSTAT
-      cmp #$ff
-      beq checkJoyGetKey       ; key not pressed, check Joy
-      cmp #$f7                 ; SHIFT
-      beq checkJoyGetKey
+      and #%00000100  ;  any key  
+      bne checkJoyGetKey       ; key not pressed, check Joy
     .ELIF TARGET = 5200
       lda SkStatSimulator
       and #%11111110
@@ -137,8 +135,8 @@ StillWait
       beq StillWait
     .IF TARGET = 800
       lda SKSTAT
-      cmp #$ff
-      bne StillWait
+      and #%00000100  ;  any key  
+      beq StillWait
       lda CONSOL
       and #%00000110           ; Select and Option only
       cmp #%00000110
@@ -186,10 +184,8 @@ KeyAutoReleased                ; autorepeat
     and #%00000101             ; Start + Option
     beq QuitToGameover
     lda SKSTAT
-    cmp #$ff
-    jeq nokeys
-    cmp #$f7                   ; SHIFT
-    jeq nokeys
+    and #%00000100  ;  any key  
+    jne nokeys
 
     lda kbcode
     and #%10111111             ; SHIFT elimination

Atari/interrupts.asm

@@ -336,6 +336,8 @@ StartPressed
          jsr _SetDLIproc
 .endm
 .proc _SetDLIproc
+    LDA #$00
+    STA NMIEN
     LDA #$C0
     STY VDSLST
     STX VDSLST+1

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

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
 

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

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

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