Handle Gxx delay commands in both row and frame...

...transitions Fixes #207.
Dn-Programming-Core-Management · Feb 27, 2024 · 797b782 · 797b782
1 parent d266d61
commit 797b782
Show file tree

Hide file tree

Showing 9 changed files with 3,567 additions and 3,540 deletions.
diff --git a/Source/drivers/asm/player.s b/Source/drivers/asm/player.s
@@ -52,17 +52,31 @@ ft_do_row_update:
 	and #%11111100
 	sta var_PlayerFlags
 :
+	lda var_Load_Frame
+	beq @SkipFrameLoad
+	ldx #$00
+
+	; handle delay part 1: skip over missed delay notes from the previous frame
+	; this allows the driver to read all the extra commands that come after Gxx
+@Delay:
+	CH_LOOP_START @DelayEpilog
+	lda var_ch_Delay, x
+	beq @DelayEpilog
+	lda #$00
+	sta var_ch_Delay, x
+	jsr ft_read_pattern ; skip over missed delay note
+@DelayEpilog:
+	CH_LOOP_END @Delay
+
 	; Switches to new frames are delayed to next row to resolve issues with delayed notes.
 	; It won't work if new pattern adresses are loaded before the delayed note is played
-	;;; ;; ; from 0.4.6
-	lda var_Load_Frame
-	beq @SkipFrameLoad	
 	lda #$00
 	sta var_Load_Frame
 	lda var_Current_Frame
 	jsr ft_load_frame
 @SkipFrameLoad:
 
+	; handle delay part 2: skip over missed delay notes from the previous row
 	; Read one row from all patterns
 	ldx #$00
 ft_read_channels:

diff --git a/Source/drivers/drv_2a03.h b/Source/drivers/drv_2a03.h
diff --git a/Source/drivers/drv_all.h b/Source/drivers/drv_all.h
diff --git a/Source/drivers/drv_fds.h b/Source/drivers/drv_fds.h
diff --git a/Source/drivers/drv_mmc5.h b/Source/drivers/drv_mmc5.h
diff --git a/Source/drivers/drv_n163.h b/Source/drivers/drv_n163.h
diff --git a/Source/drivers/drv_s5b.h b/Source/drivers/drv_s5b.h
diff --git a/Source/drivers/drv_vrc6.h b/Source/drivers/drv_vrc6.h
diff --git a/Source/drivers/drv_vrc7.h b/Source/drivers/drv_vrc7.h