diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 17:13:25 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | f40d36a5644facf02d4b792a87e52ba73b372536 (patch) | |
| tree | 94250782e4e816b6f56fff864a580454beabbd0f | |
| parent | 08a565dadd67db5c7b4d185aa316d9ac18e586b7 (diff) | |
Match se_w028.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w028.mid | bin | 0 -> 198 bytes | |||
| -rw-r--r-- | sound/songs/se_w028.s | 95 |
4 files changed, 4 insertions, 96 deletions
diff --git a/ld_script.txt b/ld_script.txt index e18106f6d..af20a656e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -793,7 +793,7 @@ SECTIONS { sound/songs/midi/se_w011.o(.rodata); sound/songs/midi/se_w017.o(.rodata); sound/songs/midi/se_w019.o(.rodata); - sound/songs/se_w028.o(.rodata); + sound/songs/midi/se_w028.o(.rodata); sound/songs/midi/se_w013b.o(.rodata); sound/songs/se_w044.o(.rodata); sound/songs/se_w029.o(.rodata); @@ -1242,5 +1242,8 @@ $(MID_SUBDIR)/se_w025b.s: %.s: %.mid $(MID_SUBDIR)/se_w026.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_w028.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_w028.mid b/sound/songs/midi/se_w028.mid Binary files differnew file mode 100644 index 000000000..7a053f799 --- /dev/null +++ b/sound/songs/midi/se_w028.mid diff --git a/sound/songs/se_w028.s b/sound/songs/se_w028.s deleted file mode 100644 index 716ff7cd8..000000000 --- a/sound/songs/se_w028.s +++ /dev/null @@ -1,95 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w028_grp, voicegroup128 - .equ se_w028_pri, 4 - .equ se_w028_rev, reverb_set+50 - .equ se_w028_mvl, 127 - .equ se_w028_key, 0 - .equ se_w028_tbs, 1 - .equ se_w028_exg, 0 - .equ se_w028_cmp, 1 - - .section .rodata - .global se_w028 - .align 2 - -@********************** Track 1 **********************@ - -se_w028_1: - .byte KEYSH , se_w028_key+0 - .byte TEMPO , 150*se_w028_tbs/2 - .byte VOICE , 26 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w028_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Gn5 , v092 - .byte W02 - .byte Cn5 - .byte W04 - .byte VOICE , 36 - .byte VOL , 84*se_w028_mvl/mxv - .byte PAN , c_v+5 - .byte N15 , Gn5 , v040 - .byte W01 - .byte PAN , c_v-10 - .byte W01 - .byte c_v+5 - .byte W01 - .byte c_v-10 - .byte W01 - .byte VOL , 94*se_w028_mvl/mxv - .byte PAN , c_v+5 - .byte W02 - .byte c_v-10 - .byte W01 - .byte c_v+5 - .byte W01 - .byte c_v-10 - .byte W01 - .byte VOL , 110*se_w028_mvl/mxv - .byte PAN , c_v+5 - .byte W01 - .byte c_v-10 - .byte W02 - .byte VOL , 96*se_w028_mvl/mxv - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 68*se_w028_mvl/mxv - .byte PAN , c_v-10 - .byte W01 - .byte VOL , 15*se_w028_mvl/mxv - .byte PAN , c_v+5 - .byte W01 - .byte c_v-10 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_w028_2: - .byte KEYSH , se_w028_key+0 - .byte VOICE , 25 - .byte VOL , 110*se_w028_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Cn3 , v040 - .byte W02 - .byte N01 - .byte W22 - .byte FINE - -@******************************************************@ - .align 2 - -se_w028: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w028_pri @ Priority - .byte se_w028_rev @ Reverb. - - .word se_w028_grp - - .word se_w028_1 - .word se_w028_2 - - .end |