From ecee38fef76381e4d833742d590a54c36012841f Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Fri, 8 Nov 2019 13:22:02 -0500 Subject: [PATCH] ds: fix bug with the compresses read/load r13/r5 issue --- demosplash/missing.s | 2 ++ demosplash/pt3_lib_init.s | 2 +- demosplash/pt3_lib_play_frame.s | 27 ++++++++++++++------------- demosplash/pt3_lib_write_lc.s | 2 +- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/demosplash/missing.s b/demosplash/missing.s index ef3d0167..d863a3d6 100644 --- a/demosplash/missing.s +++ b/demosplash/missing.s @@ -17,6 +17,8 @@ missing_intro: jsr create_update_type1 + jsr play_frame_compressed + ;============================= ; Load graphic page0 diff --git a/demosplash/pt3_lib_init.s b/demosplash/pt3_lib_init.s index e2f7e448..037b1ade 100644 --- a/demosplash/pt3_lib_init.s +++ b/demosplash/pt3_lib_init.s @@ -387,7 +387,7 @@ note_table_propogate_loop: ;================================================ ; propogation isn't enough, various values - ; are ofte off by one, so adjust using a bitmask + ; are often off by one, so adjust using a bitmask ;================================================ NoteTableAdjust: diff --git a/demosplash/pt3_lib_play_frame.s b/demosplash/pt3_lib_play_frame.s index 8c71b725..ae940705 100644 --- a/demosplash/pt3_lib_play_frame.s +++ b/demosplash/pt3_lib_play_frame.s @@ -263,36 +263,37 @@ update_pt3_play: ; 13 lda music_addr_table+0,Y ; 4 - sta r0_smc+2 ; 4 + sta r0_smc+2 ; 4 ; D0 lda music_addr_table+1,Y ; 4 - sta r1_smc+2 ; 4 + sta r1_smc+2 ; 4 ; D1 lda music_addr_table+2,Y ; 4 - sta r2_smc+2 ; 4 + sta r2_smc+2 ; 4 ; D2 lda music_addr_table+3,Y ; 4 - sta r4_smc+2 ; 4 - - lda music_addr_table+4,Y ; 4 - sta r13_smc+2 ; 4 + sta r4_smc+2 ; 4 ; D3 lda music_addr_table+5,Y ; 4 - sta r6_smc+2 ; 4 + sta r5_smc+2 ; 4 ; D4 - lda music_addr_table+6,Y ; 4 + lda music_addr_table+4,Y ; 4 ; D5 + sta r6_smc+2 ; 4 + sta r13_smc+2 ; 4 ; D5 + + lda music_addr_table+6,Y ; 4 ; D6 sta r7_smc+2 ; 4 - lda music_addr_table+7,Y ; 4 + lda music_addr_table+7,Y ; 4 ; D7 sta r8_smc+2 ; 4 - lda music_addr_table+8,Y ; 4 + lda music_addr_table+8,Y ; 4 ; D8 sta r9_smc+2 ; 4 - lda music_addr_table+9,Y ; 4 + lda music_addr_table+9,Y ; 4 ; D9 sta r11_smc+2 ; 4 - lda music_addr_table+10,Y ; 4 + lda music_addr_table+10,Y ; 4 ; DA sta r12_smc+2 ; 4 ;========== ; 11*8 = 88 diff --git a/demosplash/pt3_lib_write_lc.s b/demosplash/pt3_lib_write_lc.s index ca4d98a7..f7751291 100644 --- a/demosplash/pt3_lib_write_lc.s +++ b/demosplash/pt3_lib_write_lc.s @@ -83,7 +83,7 @@ pt3_set_pages: lda music_addr_table+3,Y sta r4_wrsmc+2 - lda music_addr_table+4,Y + lda music_addr_table+4,Y ;5+13=D4 sta r13_wrsmc+2 lda music_addr_table+5,Y