diff --git a/lumber.asm b/lumber.asm index bc1b712..d45082a 100644 --- a/lumber.asm +++ b/lumber.asm @@ -431,10 +431,10 @@ wait_for_timer ; ------- RMT ------- lda sfx_effect bmi lab2 - asl @ ; * 2 + asl ; * 2 tay ;Y = 2,4,..,16 instrument number * 2 (0,2,4,..,126) - ldx #0 ;X = 0 channel (0..3 or 0..7 for stereo module) - lda #0 ;A = 0 note (0..60) + ldx #3 ;X = 0 channel (0..3 or 0..7 for stereo module) + lda #00 ;A = 0 note (0..60) jsr RASTERMUSICTRACKER+15 ;RMT_SFX start tone (It works only if FEAT_SFX is enabled !!!) lda #$ff sta sfx_effect ;reinit value @@ -1283,11 +1283,12 @@ main GameStart RMTsong song_main_menu jsr StartScreen - RMTSong song_ingame jsr ScoreClear gameloop jsr MakeDarkScreen jsr LevelScreen + RMTSong song_ingame + ;RMTSong song_empty jsr PlayLevel ;jsr NextLevel ; RMTSong song_ingame @@ -1304,6 +1305,7 @@ gameOver ;game over ;RMTSong song_game_over ;jsr HiScoreCheckWrite + RMTsong song_records jsr GameOverScreen jmp GameStart ;-------------------------------------------------- @@ -1388,6 +1390,7 @@ EndOfStartScreen mva #%00000011 GRACTL jsr SetPMr1 mva #1 StateFlag ; GO! screen + RMTsong song_go jsr AnimateGoLine mwa #dl_level dlptrs mva #2 StateFlag ; Game @@ -3496,7 +3499,7 @@ track_endvariables MODUL ; RMT module is standard Atari binary file already ; include music RMT module: - ins "msx/tbm1_str.rmt",+6 + ins "msx/tbm2_str.rmt",+6 MODULEND ;----------------------------------- @@ -3507,8 +3510,11 @@ sfx_ciach = $03 ; RMT songs (lines) ;-------------------------------- song_main_menu = $00 -song_ingame = $07 +song_ingame = $08 song_game_over = $05 +song_go = $0d +song_records = $10 +song_empty = $0e RUN main diff --git a/lumber.xex b/lumber.xex index 9d04103..7955d09 100644 Binary files a/lumber.xex and b/lumber.xex differ diff --git a/msx/feat.txt b/msx/feat.txt index 72be314..20bff19 100644 --- a/msx/feat.txt +++ b/msx/feat.txt @@ -1,5 +1,5 @@ ;* --------BEGIN-------- -;* Z:\GitHub\Young-lumberjack\msx\tbm1_str.rmt +;* Z:\GitHub\Young-lumberjack\msx\tbm2_str.rmt FEAT_SFX equ 1 FEAT_GLOBALVOLUMEFADE equ 0 ;RMTGLOBALVOLUMEFADE variable FEAT_NOSTARTINGSONGLINE equ 0 diff --git a/msx/tbm2_str.rmt b/msx/tbm2_str.rmt new file mode 100644 index 0000000..3d512bb Binary files /dev/null and b/msx/tbm2_str.rmt differ