From 89311623faea2da01481be7f96704a4c2b7ccc16 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Tue, 6 Sep 2016 15:22:06 -0400 Subject: bit more work on the sound engine --- jumpmanjr.dasm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'jumpmanjr.dasm') diff --git a/jumpmanjr.dasm b/jumpmanjr.dasm index 77b2963..dde3f36 100644 --- a/jumpmanjr.dasm +++ b/jumpmanjr.dasm @@ -1,5 +1,5 @@ ; da65 V2.15 - Git 104f898 -; Created: 2016-09-05 19:01:23 +; Created: 2016-09-06 14:33:25 ; Input file: jumpmanjr.rom ; Page: 1 @@ -71,7 +71,7 @@ sfx_ptr := $063C sfx_slot_tempo := $063E ; tempo of this sfx sfx_slot_timer := $063F sfx_slot_duration:= $0646 -sfx_slot_freq := $0647 +sfx_slot_audc := $0647 sfx_slot_curpos := $064E ; address we've got to so far, playing this sfx sfx_tempo_tmp := $0661 ; ?? num_tmp := $0665 ; temp used by print_number @@ -218,7 +218,7 @@ GRACTL := $D01D HITCLR := $D01E CONSOL := $D01F AUDF1_minus_two := $D1FE -AUDF1_minus_one := $D1FF +AUDC1_minus_two := $D1FF AUDF1 := $D200 AUDC1 := $D201 AUDF2 := $D202 @@ -576,7 +576,7 @@ is_slot_active: cmp sfx_slot_duration,x ; 8170 DD 46 06 .F. bne next_sfx_slot ; 8173 D0 EA .. lda #$00 ; 8175 A9 00 .. - sta AUDF1_minus_one,x ; 8177 9D FF D1 ... + sta AUDC1_minus_two,x ; 8177 9D FF D1 ... jmp next_sfx_slot ; 817A 4C 5F 81 L_. ; ---------------------------------------------------------------------------- @@ -590,7 +590,7 @@ sfx_next_note: cmp #$04 ; 818B C9 04 .. bcs sfx_play_note ; 818D B0 77 .w cmp #$01 ; 818F C9 01 .. - beq sfx_change_tempo ; 8191 F0 1B .. + beq sfx_set_audc ; 8191 F0 1B .. cmp #$02 ; 8193 C9 02 .. beq sfx_jump_opcode ; 8195 F0 31 .1 cmp #$03 ; 8197 C9 03 .. @@ -601,7 +601,7 @@ sfx_next_note: ; y==0 on entry sfx_play_rest: tya ; 819E 98 . - sta AUDF1_minus_one,x ; 819F 9D FF D1 ... + sta AUDC1_minus_two,x ; 819F 9D FF D1 ... iny ; 81A2 C8 . lda (zp_temp1),y ; 81A3 B1 CB .. sta sfx_slot_timer,x ; 81A5 9D 3F 06 .?. @@ -610,10 +610,10 @@ sfx_play_rest: ; ---------------------------------------------------------------------------- ; y==0 on entry -sfx_change_tempo: +sfx_set_audc: iny ; 81AE C8 . lda (zp_temp1),y ; 81AF B1 CB .. - sta sfx_slot_freq,x ; 81B1 9D 47 06 .G. + sta sfx_slot_audc,x ; 81B1 9D 47 06 .G. iny ; 81B4 C8 . lda (zp_temp1),y ; 81B5 B1 CB .. sta sfx_slot_duration,x ; 81B7 9D 46 06 .F. @@ -663,8 +663,8 @@ sfx_play_note: iny ; 8209 C8 . lda (zp_temp1),y ; 820A B1 CB .. sta sfx_slot_timer,x ; 820C 9D 3F 06 .?. - lda sfx_slot_freq,x ; 820F BD 47 06 .G. - sta AUDF1_minus_one,x ; 8212 9D FF D1 ... + lda sfx_slot_audc,x ; 820F BD 47 06 .G. + sta AUDC1_minus_two,x ; 8212 9D FF D1 ... clc ; 8215 18 . lda sfx_slot_curpos,x ; 8216 BD 4E 06 .N. adc #$02 ; 8219 69 02 i. @@ -679,7 +679,7 @@ cpos_hi_ok: sfx_finished: lda #$00 ; 8226 A9 00 .. sta sfx_slot_tempo,x ; 8228 9D 3E 06 .>. - sta AUDF1_minus_one,x ; 822B 9D FF D1 ... + sta AUDC1_minus_two,x ; 822B 9D FF D1 ... jmp next_sfx_slot ; 822E 4C 5F 81 L_. ; ---------------------------------------------------------------------------- -- cgit v1.2.3