From b1eac20e6831f0f97d395727e921767b9c94145e Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sun, 3 Oct 2021 23:03:49 -0400 Subject: [PATCH] peasant: update ssi sound, also fix problem with stereo music stopped being stereo in ending as we weren't resetting the 6522s enough after doing text --- games/peasant/ending.s | 3 ++ games/peasant/ssi263_simple_speech.s | 45 ++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/games/peasant/ending.s b/games/peasant/ending.s index d07baede..29172b7c 100644 --- a/games/peasant/ending.s +++ b/games/peasant/ending.s @@ -38,6 +38,9 @@ ending: and #SOUND_MOCKINGBOARD beq skip_end_music + jsr mockingboard_init + jsr reset_ay_both + jsr mockingboard_setup_interrupt lda #$09 ; don't end after 4 diff --git a/games/peasant/ssi263_simple_speech.s b/games/peasant/ssi263_simple_speech.s index 5ef7c120..a235c1be 100644 --- a/games/peasant/ssi263_simple_speech.s +++ b/games/peasant/ssi263_simple_speech.s @@ -52,24 +52,24 @@ ssi263_speech_init: ; set defaults ; filter frequency - lda #$E9 - ldx #SSI263_F - jsr ssi263_write_chip +; lda #$E9 +; ldx #SSI263_F +; jsr ssi263_write_chip ; control / articulation/ amplitude - lda #$5C - ldx #SSI263_CAA - jsr ssi263_write_chip +; lda #$5C +; ldx #SSI263_CAA +; jsr ssi263_write_chip ; rate/inflection - lda #$A8 - ldx #SSI263_RI - jsr ssi263_write_chip +; lda #$A8 +; ldx #SSI263_RI +; jsr ssi263_write_chip ; inflection - lda #$50 - ldx #SSI263_I - jsr ssi263_write_chip +; lda #$50 +; ldx #SSI263_I +; jsr ssi263_write_chip cli ; enable interrupts @@ -186,6 +186,27 @@ not_end: ldx #SSI263_DRP ; duration/phoneme jsr ssi263_write_chip + ; filter frequency + lda #$E9 + ldx #SSI263_F + jsr ssi263_write_chip + + ; control / articulation/ amplitude + lda #$5C + ldx #SSI263_CAA + jsr ssi263_write_chip + + ; rate/inflection + lda #$A8 + ldx #SSI263_RI + jsr ssi263_write_chip + + ; inflection + lda #$50 + ldx #SSI263_I + jsr ssi263_write_chip + + ; Next data (inc 16 bit) inc SPEECH_PTRL bne no_oflo