diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 16:31:14 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | bc1b5bacc921bba76b62de2dc96b1f01378b9ea0 (patch) | |
| tree | 95317ee0abbb3865ee71794f6a57da9af0317bdb | |
| parent | 1d08ff3a60d55fb2a91720e8e625c241c70e8596 (diff) | |
Match se_track_move.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_track_move.mid | bin | 0 -> 373 bytes | |||
| -rw-r--r-- | sound/songs/se_track_move.s | 146 |
4 files changed, 4 insertions, 147 deletions
diff --git a/ld_script.txt b/ld_script.txt index ba1054eb5..3f4a1714d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -683,7 +683,7 @@ SECTIONS { sound/songs/midi/se_tk_warpout.o(.rodata); sound/songs/se_tu_saa.o(.rodata); sound/songs/midi/se_hi_turun.o(.rodata); - sound/songs/se_track_move.o(.rodata); + sound/songs/midi/se_track_move.o(.rodata); sound/songs/se_track_stop.o(.rodata); sound/songs/midi/se_track_haiki.o(.rodata); sound/songs/midi/se_track_door.o(.rodata); @@ -1173,5 +1173,8 @@ $(MID_SUBDIR)/se_track_door.s: %.s: %.mid $(MID_SUBDIR)/se_track_haiki.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4 +$(MID_SUBDIR)/se_track_move.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_track_move.mid b/sound/songs/midi/se_track_move.mid Binary files differnew file mode 100644 index 000000000..ced96f83a --- /dev/null +++ b/sound/songs/midi/se_track_move.mid diff --git a/sound/songs/se_track_move.s b/sound/songs/se_track_move.s deleted file mode 100644 index 9b33a3780..000000000 --- a/sound/songs/se_track_move.s +++ /dev/null @@ -1,146 +0,0 @@ - .include "MPlayDef.s" - - .equ se_track_move_grp, voicegroup128 - .equ se_track_move_pri, 4 - .equ se_track_move_rev, reverb_set+50 - .equ se_track_move_mvl, 127 - .equ se_track_move_key, 0 - .equ se_track_move_tbs, 1 - .equ se_track_move_exg, 0 - .equ se_track_move_cmp, 1 - - .section .rodata - .global se_track_move - .align 2 - -@********************** Track 1 **********************@ - -se_track_move_1: - .byte KEYSH , se_track_move_key+0 - .byte TEMPO , 150*se_track_move_tbs/2 - .byte VOICE , 10 - .byte VOL , 18*se_track_move_mvl/mxv - .byte BEND , c_v+0 - .byte N96 , Cs3 , v127 - .byte W08 - .byte VOL , 31*se_track_move_mvl/mxv - .byte W08 - .byte 42*se_track_move_mvl/mxv - .byte W08 - .byte 59*se_track_move_mvl/mxv - .byte W08 - .byte 74*se_track_move_mvl/mxv - .byte W08 - .byte 88*se_track_move_mvl/mxv - .byte W08 - .byte 106*se_track_move_mvl/mxv - .byte W08 - .byte 118*se_track_move_mvl/mxv - .byte W08 - .byte 127*se_track_move_mvl/mxv - .byte W32 -se_track_move_1_B1: - .byte TIE , Cs3 , v127 - .byte W96 - .byte W96 - .byte W96 - .byte EOT - .byte GOTO - .word se_track_move_1_B1 - .byte FINE - -@********************** Track 2 **********************@ - -se_track_move_2: - .byte KEYSH , se_track_move_key+0 - .byte VOICE , 11 - .byte VOL , 18*se_track_move_mvl/mxv - .byte W08 - .byte 31*se_track_move_mvl/mxv - .byte W04 - .byte N03 , Fn2 , v044 - .byte W04 - .byte VOL , 42*se_track_move_mvl/mxv - .byte W02 - .byte N03 , An2 - .byte W06 - .byte VOL , 59*se_track_move_mvl/mxv - .byte W06 - .byte N03 , Cs2 , v052 - .byte W02 - .byte VOL , 74*se_track_move_mvl/mxv - .byte W08 - .byte 88*se_track_move_mvl/mxv - .byte W08 - .byte 106*se_track_move_mvl/mxv - .byte N03 , Gn2 , v044 - .byte W08 - .byte VOL , 118*se_track_move_mvl/mxv - .byte W08 - .byte 127*se_track_move_mvl/mxv - .byte W08 - .byte N01 , Bn2 , v032 - .byte W12 - .byte N03 , Fn2 , v044 - .byte W12 -se_track_move_2_B1: - .byte W12 - .byte N03 , Fn2 , v044 - .byte W06 - .byte An2 , v032 - .byte W12 - .byte Cs2 , v052 - .byte W12 - .byte An2 , v032 - .byte W06 - .byte Gn2 , v044 - .byte W24 - .byte N03 - .byte W12 - .byte Fn2 - .byte W12 - .byte Gn2 - .byte W18 - .byte Cs2 , v052 - .byte W12 - .byte N01 , Bn2 , v032 - .byte W06 - .byte N03 , Fn2 , v044 - .byte W24 - .byte N03 - .byte W18 - .byte Cs2 , v052 - .byte W18 - .byte Gn2 , v044 - .byte W18 - .byte An2 - .byte W12 - .byte Cs2 , v052 - .byte W18 - .byte Gn2 , v044 - .byte W12 - .byte Fn2 - .byte W18 - .byte N01 , Bn2 , v032 - .byte W06 - .byte N03 , Fn2 , v044 - .byte W12 - .byte GOTO - .word se_track_move_2_B1 - .byte FINE - -@******************************************************@ - .align 2 - -se_track_move: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_track_move_pri @ Priority - .byte se_track_move_rev @ Reverb. - - .word se_track_move_grp - - .word se_track_move_1 - .word se_track_move_2 - - .end |