diff --git a/art/muzyka_stripped.rmt b/art/muzyka_stripped.rmt index ef84c44..e5a40fb 100644 Binary files a/art/muzyka_stripped.rmt and b/art/muzyka_stripped.rmt differ diff --git a/art/rmt_feat.a65 b/art/rmt_feat.a65 old mode 100644 new mode 100755 index 6f1b9dd..8649d97 --- a/art/rmt_feat.a65 +++ b/art/rmt_feat.a65 @@ -1,10 +1,11 @@ ;* --------BEGIN-------- -;* Z:\home\pkalinowski\Seafile\atari\projects\Avery_Breakout\art\muzyka_stripped.rmt +;Settings for music +;* C:\Users\pawel\Dropbox\programming\tetryx\artwork\stripped.rmt FEAT_SFX equ 1 FEAT_GLOBALVOLUMEFADE equ 0 ;RMTGLOBALVOLUMEFADE variable FEAT_NOSTARTINGSONGLINE equ 0 FEAT_INSTRSPEED equ 1 -FEAT_CONSTANTSPEED equ 5 ;(0 times) +FEAT_CONSTANTSPEED equ 0 ;(2 times) FEAT_COMMAND1 equ 1 ;(25 times) FEAT_COMMAND2 equ 0 ;(0 times) FEAT_COMMAND3 equ 0 ;(0 times) @@ -34,8 +35,8 @@ FEAT_TABLETYPE equ 0 ;(0 times) FEAT_TABLEMODE equ 0 ;(0 times) FEAT_TABLEGO equ 0 ;(0 times) FEAT_AUDCTLMANUALSET equ 0 ;(0 times) -FEAT_VOLUMEMIN equ 1 ;(1 times) -FEAT_EFFECTVIBRATO equ 1 ;(1 times) +FEAT_VOLUMEMIN equ 0 ;(0 times) +FEAT_EFFECTVIBRATO equ 0 ;(0 times) FEAT_EFFECTFSHIFT equ 1 ;(1 times) +STEREOMODE equ 0 ;* --------END-------- - diff --git a/art/rmtplayr.a65 b/art/rmtplayr.a65 old mode 100644 new mode 100755 index 73baa3e..a47629b --- a/art/rmtplayr.a65 +++ b/art/rmtplayr.a65 @@ -16,7 +16,7 @@ ;* ;* 3. Because of RMTplayer provides a lot of effects, it spent a lot of CPU time. ;* -STEREOMODE equ 0 ;0 => compile RMTplayer for 4 tracks mono +;* STEREOMODE equ 0..3 ;0 => compile RMTplayer for 4 tracks mono ;* ;1 => compile RMTplayer for 8 tracks stereo ;* ;2 => compile RMTplayer for 4 tracks stereo L1 R2 R3 L4 ;* ;3 => compile RMTplayer for 4 tracks stereo L1 L2 R3 R4 @@ -27,7 +27,7 @@ TRACKS equ 8 TRACKS equ 4 EIF ;* -;PLAYER equ $3400 +PLAYER equ *+$400 ;equ $4400 ;* ;* RMT FEATures definitions file ;* For optimizations of RMT player routine to concrete RMT modul only! diff --git a/averybreakout.asm b/averybreakout.asm index 19cd6a2..88af044 100644 --- a/averybreakout.asm +++ b/averybreakout.asm @@ -19,6 +19,7 @@ lda #:1 jsr RMTSongSelect .endm + ;--------------------------------------------------- icl 'lib/ATARISYS.ASM' icl 'lib/MACRO.ASM' @@ -59,7 +60,12 @@ maxBrickLines = 14 ; maximum number of lines of bricks to be eradicated RMT_zpvars = AutoPlay+1 ; POZOR!!! RMT vars go here ;--------------------------------------------------- org $2000 -;--------------------------------------------------- +MODUL + ins 'art/muzyka_stripped.rmt',+5 + .align $100 + icl 'art/rmtplayr.a65' + ;--------------------------------------------------- + .align $400 font ins 'art/Mild West.fnt' dl @@ -223,6 +229,8 @@ JNotFire mva #0 dliCount ; mva #13 VSCROL ; FOX gfx mode only + +/* bit RMT_blocked bmi SkipRMTVBL ; ------- RMT ------- @@ -241,6 +249,40 @@ lab2 jsr RASTERMUSICTRACKER+3 ;1 play ; ------- RMT ------- SkipRMTVBL + +*/ + ;sfx + lda sfx_effect + bmi lab2 + asl @ ; * 2 + tay ;Y = 2,4,..,16 instrument number * 2 (0,2,4,..,126) + ldx #3 ;X = 3 channel (0..3 or 0..7 for stereo module) + lda #12 ;A = 12 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 +; +lab2 + /* + lda ticksPerSecond + cmp #60 + bne PALMusic + ; it is NTSC HERE -- slow down the sound + lda ticks + and #%00000111 + beq skipSoundFrame +PALMusic + lda slowMusic + beq playNow + lda ticks + and #%00000011 + beq skipSoundFrame +playNow + */ + jsr RASTERMUSICTRACKER+3 +skipSoundFrame + jmp XITVBV .endp ;-------------------------------------------------- @@ -1236,9 +1278,23 @@ brickcolorTab sta sfx_effect ; pokeys init - lda #3 ; stereo (pseudo) - sta POKEY+$0f ; stereo - sta POKEY+$1f ; stereo + lda #3 + sta skctl ; put Pokey into Init + sta skctl+$10 + ldx #8 + lda #0 +@ + sta $D200,x ; clear all voices, set AUDCTL to 00 + sta $D210,x ; clear all voices, set AUDCTL to 00 + dex + bpl @- + + ;RMT INIT + ldx #MODUL ;hi byte of RMT module to Y reg + lda #0 ;starting song line 0-255 to A reg + jsr RASTERMUSICTRACKER ;Init + lda dmactls and #$fc @@ -1740,7 +1796,7 @@ ballDisp marginLine :40 .byte 0 .ds $400 ; buffer for RMT player .align $100 -PLAYER +;PLAYER ;-------------------------------- ; names of RMT instruments (sfx) ;-------------------------------- @@ -1753,9 +1809,5 @@ song_main_menu = $00 song_ingame = $07 song_game_over = $12 - icl 'art/rmtplayr_modified.asm' - org $6000 -MODUL - ins 'art/muzyka.rmt',+6 -MODULEND + RUN main diff --git a/averybreakout.xex b/averybreakout.xex index 258ec01..1b83c41 100644 Binary files a/averybreakout.xex and b/averybreakout.xex differ