diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 17:20:51 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | f11ca86b46331c5d6b454c72de81aae8559ceef1 (patch) | |
| tree | b27e0e85c730064ba592867ecf0bf821d4e940fe | |
| parent | 85ec6ccf460d54d1373af179e8c783d666bb004c (diff) | |
Match se_w036.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w036.mid | bin | 0 -> 200 bytes | |||
| -rw-r--r-- | sound/songs/se_w036.s | 95 |
4 files changed, 4 insertions, 96 deletions
diff --git a/ld_script.txt b/ld_script.txt index 4ff9d58de..b1b43aab1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -786,7 +786,7 @@ SECTIONS { sound/songs/se_w221.o(.rodata); sound/songs/se_w221b.o(.rodata); sound/songs/se_w052.o(.rodata); - sound/songs/se_w036.o(.rodata); + sound/songs/midi/se_w036.o(.rodata); sound/songs/se_w059.o(.rodata); sound/songs/se_w059b.o(.rodata); sound/songs/midi/se_w010.o(.rodata); @@ -1251,5 +1251,8 @@ $(MID_SUBDIR)/se_w029.s: %.s: %.mid $(MID_SUBDIR)/se_w030.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_w036.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_w036.mid b/sound/songs/midi/se_w036.mid Binary files differnew file mode 100644 index 000000000..e5427c8df --- /dev/null +++ b/sound/songs/midi/se_w036.mid diff --git a/sound/songs/se_w036.s b/sound/songs/se_w036.s deleted file mode 100644 index eb32e1489..000000000 --- a/sound/songs/se_w036.s +++ /dev/null @@ -1,95 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w036_grp, voicegroup128 - .equ se_w036_pri, 4 - .equ se_w036_rev, reverb_set+50 - .equ se_w036_mvl, 127 - .equ se_w036_key, 0 - .equ se_w036_tbs, 1 - .equ se_w036_exg, 0 - .equ se_w036_cmp, 1 - - .section .rodata - .global se_w036 - .align 2 - -@********************** Track 1 **********************@ - -se_w036_1: - .byte KEYSH , se_w036_key+0 - .byte TEMPO , 150*se_w036_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 105*se_w036_mvl/mxv - .byte BEND , c_v-48 - .byte N10 , Gn0 , v127 - .byte W02 - .byte PAN , c_v+7 - .byte BEND , c_v-32 - .byte W01 - .byte c_v-16 - .byte W01 - .byte PAN , c_v+11 - .byte BEND , c_v+0 - .byte W02 - .byte c_v+15 - .byte W01 - .byte PAN , c_v+14 - .byte W01 - .byte BEND , c_v+32 - .byte W01 - .byte PAN , c_v+19 - .byte W03 - .byte c_v+0 - .byte VOL , 105*se_w036_mvl/mxv - .byte BEND , c_v-32 - .byte N10 - .byte W02 - .byte PAN , c_v-8 - .byte BEND , c_v-16 - .byte W01 - .byte c_v+0 - .byte W01 - .byte PAN , c_v-11 - .byte BEND , c_v+16 - .byte W02 - .byte c_v+32 - .byte W01 - .byte PAN , c_v-15 - .byte W01 - .byte BEND , c_v+48 - .byte W01 - .byte PAN , c_v-20 - .byte W03 - .byte c_v+0 - .byte VOL , 105*se_w036_mvl/mxv - .byte BEND , c_v-16 - .byte N10 - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte c_v+16 - .byte W01 - .byte c_v+32 - .byte W02 - .byte c_v+47 - .byte W02 - .byte c_v+63 - .byte W16 - .byte FINE - -@******************************************************@ - .align 2 - -se_w036: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w036_pri @ Priority - .byte se_w036_rev @ Reverb. - - .word se_w036_grp - - .word se_w036_1 - - .end |