diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 17:17:26 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | 85ec6ccf460d54d1373af179e8c783d666bb004c (patch) | |
| tree | deee1a4433a8057045bc7899dfb93deb10f875cf | |
| parent | b6128b7e39fa7ba71614976f3377be132897146a (diff) | |
Match se_w030.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w030.mid | bin | 0 -> 148 bytes | |||
| -rw-r--r-- | sound/songs/se_w030.s | 67 |
4 files changed, 4 insertions, 68 deletions
diff --git a/ld_script.txt b/ld_script.txt index 7cd40e6a8..4ff9d58de 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -800,7 +800,7 @@ SECTIONS { sound/songs/se_w057.o(.rodata); sound/songs/se_w056.o(.rodata); sound/songs/se_w250.o(.rodata); - sound/songs/se_w030.o(.rodata); + sound/songs/midi/se_w030.o(.rodata); sound/songs/se_w039.o(.rodata); sound/songs/se_w054.o(.rodata); sound/songs/se_w077.o(.rodata); @@ -1248,5 +1248,8 @@ $(MID_SUBDIR)/se_w028.s: %.s: %.mid $(MID_SUBDIR)/se_w029.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_w030.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_w030.mid b/sound/songs/midi/se_w030.mid Binary files differnew file mode 100644 index 000000000..426cdfea4 --- /dev/null +++ b/sound/songs/midi/se_w030.mid diff --git a/sound/songs/se_w030.s b/sound/songs/se_w030.s deleted file mode 100644 index 35097ca84..000000000 --- a/sound/songs/se_w030.s +++ /dev/null @@ -1,67 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w030_grp, voicegroup128 - .equ se_w030_pri, 4 - .equ se_w030_rev, reverb_set+50 - .equ se_w030_mvl, 127 - .equ se_w030_key, 0 - .equ se_w030_tbs, 1 - .equ se_w030_exg, 0 - .equ se_w030_cmp, 1 - - .section .rodata - .global se_w030 - .align 2 - -@********************** Track 1 **********************@ - -se_w030_1: - .byte KEYSH , se_w030_key+0 - .byte TEMPO , 150*se_w030_tbs/2 - .byte VOICE , 21 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w030_mvl/mxv - .byte BEND , c_v+1 - .byte N01 , Bn5 , v127 - .byte W02 - .byte VOICE , 18 - .byte N01 , Cn4 - .byte W02 - .byte VOICE , 36 - .byte N06 , Gn5 , v040 - .byte W02 - .byte VOL , 58*se_w030_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v+5 - .byte W01 - .byte VOL , 71*se_w030_mvl/mxv - .byte PAN , c_v-14 - .byte BEND , c_v+13 - .byte W01 - .byte VOL , 84*se_w030_mvl/mxv - .byte PAN , c_v+16 - .byte BEND , c_v+21 - .byte W01 - .byte VOL , 97*se_w030_mvl/mxv - .byte PAN , c_v-14 - .byte BEND , c_v+33 - .byte W01 - .byte VOL , 110*se_w030_mvl/mxv - .byte W14 - .byte FINE - -@******************************************************@ - .align 2 - -se_w030: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w030_pri @ Priority - .byte se_w030_rev @ Reverb. - - .word se_w030_grp - - .word se_w030_1 - - .end |