Added win music, finished tweaking sfx

Author: SlithyMatt

ChaseVaultWin.vgm

@@ -11,3 +11,4 @@
 ./asc2bin.exe normx.txt NORMX.BIN A000
 ./asc2bin.exe normy.txt NORMY.BIN A000
 ./vgm2x16opm.exe ChaseVaultTheme.vgm MUSIC.BIN A000
+./vgm2x16opm.exe ChaseVaultWin.vgm WINMUSIC.BIN A000

build_bins.sh

@@ -14,8 +14,9 @@ bm_filename:   .asciiz "bitmap.bin"
 normx_fn:      .asciiz "normx.bin"
 normy_fn:      .asciiz "normy.bin"
 music_fn:      .asciiz "music.bin"
+win_music_fn:  .asciiz "winmusic.bin"
 end_filenames:
-FILES_TO_LOAD = 4
+FILES_TO_LOAD = 5
 bankparams:
 .byte BITMAP_BANK                ; bank
 .byte normx_fn-bm_filename-1     ; filename length
@@ -27,7 +28,10 @@ bankparams:
 .byte music_fn-normy_fn-1
 .word normy_fn
 .byte GAME_MUSIC_BANK
-.byte end_filenames-music_fn-1
+.byte win_music_fn-music_fn-1
 .word music_fn
+.byte WIN_MUSIC_BANK
+.byte end_filenames-win_music_fn-1
+.word win_music_fn
 
 .endif

filenames.asm

@@ -9,6 +9,8 @@ __music_delay: .byte 0
 
 __music_playing: .byte 1
 
+__music_looping: .byte 1
+
 music_bank: .byte GAME_MUSIC_BANK
 
 .macro INC_MUSIC_PTR
@@ -42,6 +44,15 @@ stop_music:
    jsr init_music
    rts
 
+stop_music_loop:
+   stz __music_looping
+   rts
+
+enable_music_loop:
+   lda #1
+   sta __music_looping
+   rts
+
 start_music:
    lda #1
    sta __music_playing
@@ -74,6 +85,11 @@ music_tick:
    INC_MUSIC_PTR
    bra @return
 @done:
+   lda __music_looping
+   bne @reinit
+   jsr stop_music
+   bra @return
+@reinit:
    jsr init_music
    bra @return
 @write:

music.asm

@@ -935,9 +935,15 @@ next_level:
    jmp timer_done
 @win:
    jsr stop_music
+   SET_TIMER 2, @win_music
    lda #1
    sta winscreen_req
    jmp timer_done
+@win_music:
+   lda #WIN_MUSIC_BANK
+   sta music_bank
+   jsr start_music
+   jmp timer_done
 @update_level:
    SUPERIMPOSE_RESTORE
    jsr clear_bars

player.asm

@@ -108,14 +108,16 @@ sfx_bomb:
 .byte YM_NE_NFRQ,    YM_NE | $02
 .byte OPM_DELAY_REG, 10
 .byte YM_KEY_ON,     YM_NOISE_OFF
+.byte YM_NE_NFRQ,    0
 .byte OPM_DONE_REG,  0
 
 sfx_key:
 .byte YM_KEY_ON,     YM_CH_5
 .byte YM_KC+YM_CH_5, YM_KC_OCT5 | YM_KC_C
+.byte YM_KEY_ON,     YM_CH_5 | YM_SN_ALL
 .byte YM_KEY_ON,     YM_CH_6
 .byte YM_KC+YM_CH_6, YM_KC_OCT5 | YM_KC_F
-.byte YM_KEY_ON,     YM_CH_5 | YM_SN_ALL
+.byte YM_KEY_ON,     YM_CH_6 | YM_SN_ALL
 .byte OPM_DELAY_REG, 16
 .byte YM_KEY_ON,     YM_CH_5
 .byte YM_KC+YM_CH_5, YM_KC_OCT6 | YM_KC_B_FL
@@ -141,6 +143,7 @@ sfx_unlock:
 .byte YM_KEY_ON,     YM_CH_5
 .byte YM_KEY_ON,     YM_CH_6
 .byte YM_KEY_ON,     YM_NOISE_OFF
+.byte YM_NE_NFRQ,    0
 .byte OPM_DONE_REG,  0
 
 sfx_ghost:

soundfx.asm

@@ -62,6 +62,7 @@ winscreen_tick:
    cmp #>WS_MAX_SCROLL
    bne @scroll
    stz winscreen_req
+   jsr stop_music_loop
    jmp @return
 @scroll:
    stz VERA_ctrl