integrate sound effects

src/glue.sound.a

@@ -27,21 +27,27 @@ kProgressionsByWorld                 ; chord progression to use on each world (i
          !word k6251Progression
          !word k6251Progression
          !word k6251Progression
-         !word 0
+         !word k16251Progression
-         !word 0
+         !word k16251Progression
-         !word 0
+         !word k16251Progression
-         !word 0
+         !word k16251Progression
 k251Progression
-         !byte 3
+         !byte 2
-         !word M2
+         !word M_ii
-         !word M5
+         !word M_V
-         !word M1
 k6251Progression
+         !byte 3
+         !word M_vi6
+         !word M_ii
+         !word M_V
+k16251Progression
          !byte 4
-         !word M6
+         !word M_I
-         !word M2
+         !word M_vi6
-         !word M5
+         !word M_ii
-         !word M1
+         !word M_V
+kFinalChord
+         !word M_I_LONG
 
 ReinitSoundAfterPrefChange
          ldx   gMockingboardSlot
@@ -87,9 +93,6 @@ InitPuzzleSound
          rts
 
 PlayNextChord
-         ; TODO
-         rts
-         inc   progressionIndex
          lda   gWorldID
          asl
          tax
@@ -98,7 +101,13 @@ PlayNextChord
          inx
          lda   kProgressionsByWorld, x
          sta   $FF
-         lda   progressionIndex
+         inc   progressionIndex
+         ldy   #0
+         lda   ($FE), y
+         cmp   progressionIndex
+         bne   +
+         dec   progressionIndex
++        lda   progressionIndex
          asl
          tay
          iny
@@ -110,6 +119,14 @@ PlayNextChord
          pla
          jmp   PlaySound
 
+PlayFinalChord
+; out:   preserves A
+         pha
+         +LD16 kFinalChord
+         jsr   PlaySound
+         pla
+         rts
+
 ;------------------------------------------------------------------------------
 ; SoftBell
 ;

src/million.a

@@ -87,14 +87,10 @@ Start
          !source "src/mockingduet.a"
 MainMenuMusic
          !bin    "res/M.SICILIENNE"
-;         !bin    "res/M.CEMBALO"
+M_ii     !bin    "res/M.II"
-M2
+M_V      !bin    "res/M.V"
-         !bin    "res/M.2"
+M_I      !bin    "res/M.I"
-M5
+M_I_LONG !bin    "res/M.I.LONG"
-         !bin    "res/M.5"
+M_vi6    !bin    "res/M.VI6"
-M1
-         !bin    "res/M.1"
-M6
-         !bin    "res/M.6"
 }
 LastMover

src/ui.play.a

@@ -176,6 +176,7 @@ MoveToFirstColumn
          lda   #kKeepPlaying
          rts
 
+-        jsr   PlayNextChord
 PlayEventLetter
          lda   gLastKeyPressed
          ldy   gSelectedLogicalColumn
@@ -195,8 +196,8 @@ PlayEventLetter
          bcs   PlayEventLetter       ; no word, check if more scrolling is required
          jsr   MarkTargetWord        ; show that we've finished a word
          jsr   CheckForPuzzleComplete
-         beq   PlayEventLetter       ; if puzzle isn't complete, check if more scrolling is required
+         beq   -                     ; if puzzle isn't complete, check if more scrolling is required
-         rts                         ; puzzle is complete, return to caller with A = kCompletedPuzzle
+         jmp   PlayFinalChord        ; puzzle is complete, play final sound and return to caller with A = kCompletedPuzzle
 
 MarkTargetWord
 ; in:    none
@@ -220,7 +221,7 @@ MarkTargetWord
          iny
          cpy   puzzle_logical_width
          bne   -
-         jmp   PlayNextChord
+         rts
 
 CheckForPuzzleComplete
 ; in:    none