diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 17:06:53 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | f46156a98c67345a49768d9313a3d8a036748556 (patch) | |
| tree | 45815cf29e78922f5ebab13e56cfcc6c1be68aa8 | |
| parent | 810cff0f215207295c22efe3433f27f79eae86f9 (diff) | |
Match se_w020.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w020.mid | bin | 0 -> 174 bytes | |||
| -rw-r--r-- | sound/songs/se_w020.s | 81 |
4 files changed, 4 insertions, 82 deletions
diff --git a/ld_script.txt b/ld_script.txt index 5d530a207..ee8306694 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -804,7 +804,7 @@ SECTIONS { sound/songs/se_w039.o(.rodata); sound/songs/se_w054.o(.rodata); sound/songs/se_w077.o(.rodata); - sound/songs/se_w020.o(.rodata); + sound/songs/midi/se_w020.o(.rodata); sound/songs/se_w082.o(.rodata); sound/songs/se_w047.o(.rodata); sound/songs/se_w195.o(.rodata); @@ -1230,5 +1230,8 @@ $(MID_SUBDIR)/se_w017.s: %.s: %.mid $(MID_SUBDIR)/se_w019.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_w020.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_w020.mid b/sound/songs/midi/se_w020.mid Binary files differnew file mode 100644 index 000000000..eec8ccae9 --- /dev/null +++ b/sound/songs/midi/se_w020.mid diff --git a/sound/songs/se_w020.s b/sound/songs/se_w020.s deleted file mode 100644 index 6f4e90c64..000000000 --- a/sound/songs/se_w020.s +++ /dev/null @@ -1,81 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w020_grp, voicegroup128 - .equ se_w020_pri, 4 - .equ se_w020_rev, reverb_set+50 - .equ se_w020_mvl, 127 - .equ se_w020_key, 0 - .equ se_w020_tbs, 1 - .equ se_w020_exg, 0 - .equ se_w020_cmp, 1 - - .section .rodata - .global se_w020 - .align 2 - -@********************** Track 1 **********************@ - -se_w020_1: - .byte KEYSH , se_w020_key+0 - .byte TEMPO , 150*se_w020_tbs/2 - .byte VOICE , 38 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 100*se_w020_mvl/mxv - .byte BEND , c_v+0 - .byte N05 , Fs2 , v127 - .byte W01 - .byte PAN , c_v-5 - .byte BEND , c_v-3 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v-5 - .byte W01 - .byte PAN , c_v-8 - .byte BEND , c_v-9 - .byte W01 - .byte PAN , c_v+11 - .byte BEND , c_v-12 - .byte W06 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N11 - .byte W02 - .byte BEND , c_v-10 - .byte W01 - .byte c_v-6 - .byte W01 - .byte PAN , c_v-5 - .byte BEND , c_v-4 - .byte W01 - .byte c_v+0 - .byte W01 - .byte PAN , c_v+4 - .byte BEND , c_v-3 - .byte W02 - .byte c_v+3 - .byte W01 - .byte PAN , c_v-8 - .byte BEND , c_v-9 - .byte W01 - .byte c_v-21 - .byte W01 - .byte PAN , c_v+11 - .byte BEND , c_v-28 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_w020: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w020_pri @ Priority - .byte se_w020_rev @ Reverb. - - .word se_w020_grp - - .word se_w020_1 - - .end |