diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 16:44:10 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | 61c480634dcc11e772986cca87d0b8f2c99f7f49 (patch) | |
| tree | f9b4f9ef3fbb98d000a4e1364568906dba16ea6d | |
| parent | d3899c508722378de2de1ce0d54e866304632820 (diff) | |
Match se_w006.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w006.mid | bin | 0 -> 226 bytes | |||
| -rw-r--r-- | sound/songs/se_w006.s | 107 |
4 files changed, 4 insertions, 108 deletions
diff --git a/ld_script.txt b/ld_script.txt index b6d2b9f6e..dd758635b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -808,7 +808,7 @@ SECTIONS { sound/songs/se_w082.o(.rodata); sound/songs/se_w047.o(.rodata); sound/songs/se_w195.o(.rodata); - sound/songs/se_w006.o(.rodata); + sound/songs/midi/se_w006.o(.rodata); sound/songs/se_w091.o(.rodata); sound/songs/se_w146.o(.rodata); sound/songs/se_w120.o(.rodata); @@ -1194,5 +1194,8 @@ $(MID_SUBDIR)/se_w003.s: %.s: %.mid $(MID_SUBDIR)/se_w004.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 +$(MID_SUBDIR)/se_w006.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_w006.mid b/sound/songs/midi/se_w006.mid Binary files differnew file mode 100644 index 000000000..5f59591be --- /dev/null +++ b/sound/songs/midi/se_w006.mid diff --git a/sound/songs/se_w006.s b/sound/songs/se_w006.s deleted file mode 100644 index e946f44d9..000000000 --- a/sound/songs/se_w006.s +++ /dev/null @@ -1,107 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w006_grp, voicegroup128 - .equ se_w006_pri, 4 - .equ se_w006_rev, reverb_set+50 - .equ se_w006_mvl, 127 - .equ se_w006_key, 0 - .equ se_w006_tbs, 1 - .equ se_w006_exg, 0 - .equ se_w006_cmp, 1 - - .section .rodata - .global se_w006 - .align 2 - -@********************** Track 1 **********************@ - -se_w006_1: - .byte KEYSH , se_w006_key+0 - .byte TEMPO , 150*se_w006_tbs/2 - .byte VOICE , 39 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 95*se_w006_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , An5 , v100 - .byte W01 - .byte Fn5 , v064 - .byte W01 - .byte N06 , Gn5 , v100 - .byte W01 - .byte VOL , 85*se_w006_mvl/mxv - .byte PAN , c_v-13 - .byte W01 - .byte VOL , 59*se_w006_mvl/mxv - .byte PAN , c_v+11 - .byte W02 - .byte VOL , 33*se_w006_mvl/mxv - .byte PAN , c_v-14 - .byte W01 - .byte VOL , 5*se_w006_mvl/mxv - .byte PAN , c_v+11 - .byte W03 - .byte VOL , 95*se_w006_mvl/mxv - .byte PAN , c_v+1 - .byte N01 , An5 - .byte W02 - .byte Fn5 , v064 - .byte W01 - .byte N19 , Gn5 , v100 - .byte W01 - .byte PAN , c_v-13 - .byte W01 - .byte c_v+11 - .byte W01 - .byte c_v-14 - .byte W02 - .byte c_v+11 - .byte W01 - .byte c_v-13 - .byte W01 - .byte c_v+11 - .byte VOL , 85*se_w006_mvl/mxv - .byte W01 - .byte PAN , c_v-14 - .byte VOL , 77*se_w006_mvl/mxv - .byte W01 - .byte PAN , c_v+11 - .byte VOL , 69*se_w006_mvl/mxv - .byte W02 - .byte PAN , c_v-13 - .byte VOL , 59*se_w006_mvl/mxv - .byte W01 - .byte PAN , c_v+11 - .byte VOL , 52*se_w006_mvl/mxv - .byte W01 - .byte PAN , c_v-14 - .byte VOL , 41*se_w006_mvl/mxv - .byte W01 - .byte 33*se_w006_mvl/mxv - .byte PAN , c_v+11 - .byte W01 - .byte VOL , 23*se_w006_mvl/mxv - .byte PAN , c_v-14 - .byte W02 - .byte VOL , 14*se_w006_mvl/mxv - .byte PAN , c_v+11 - .byte W01 - .byte VOL , 5*se_w006_mvl/mxv - .byte PAN , c_v-13 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_w006: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w006_pri @ Priority - .byte se_w006_rev @ Reverb. - - .word se_w006_grp - - .word se_w006_1 - - .end |