diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 16:50:00 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | d9f8e253eb4925dae1f4688f2aabde0e140585b2 (patch) | |
| tree | 099f8a620fad09b6fdfc37e3f2149ea0283687c6 | |
| parent | 700ce0382851c7d2aaeedd8a82aa0a847488e5e7 (diff) | |
Match se_w013.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w013.mid | bin | 0 -> 194 bytes | |||
| -rw-r--r-- | sound/songs/se_w013.s | 86 |
4 files changed, 4 insertions, 87 deletions
diff --git a/ld_script.txt b/ld_script.txt index b7932314c..2299e1279 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -770,7 +770,7 @@ SECTIONS { sound/songs/se_w016b.o(.rodata); sound/songs/midi/se_w003.o(.rodata); sound/songs/se_w104.o(.rodata); - sound/songs/se_w013.o(.rodata); + sound/songs/midi/se_w013.o(.rodata); sound/songs/se_w196.o(.rodata); sound/songs/se_w086.o(.rodata); sound/songs/midi/se_w004.o(.rodata); @@ -1206,5 +1206,8 @@ $(MID_SUBDIR)/se_w010.s: %.s: %.mid $(MID_SUBDIR)/se_w011.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_w013.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_w013.mid b/sound/songs/midi/se_w013.mid Binary files differnew file mode 100644 index 000000000..ae94dafa2 --- /dev/null +++ b/sound/songs/midi/se_w013.mid diff --git a/sound/songs/se_w013.s b/sound/songs/se_w013.s deleted file mode 100644 index af387436c..000000000 --- a/sound/songs/se_w013.s +++ /dev/null @@ -1,86 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w013_grp, voicegroup128 - .equ se_w013_pri, 4 - .equ se_w013_rev, reverb_set+50 - .equ se_w013_mvl, 127 - .equ se_w013_key, 0 - .equ se_w013_tbs, 1 - .equ se_w013_exg, 0 - .equ se_w013_cmp, 1 - - .section .rodata - .global se_w013 - .align 2 - -@********************** Track 1 **********************@ - -se_w013_1: - .byte KEYSH , se_w013_key+0 - .byte TEMPO , 220*se_w013_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w013_mvl/mxv - .byte PAN , c_v+14 - .byte BEND , c_v+0 - .byte N09 , Cn5 , v092 - .byte W03 - .byte PAN , c_v-15 - .byte BEND , c_v-32 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+28 - .byte W03 - .byte VOICE , 2 - .byte BEND , c_v-64 - .byte N21 , Bn2 , v108 - .byte W03 - .byte BEND , c_v-55 - .byte W03 - .byte PAN , c_v+4 - .byte BEND , c_v-45 - .byte W03 - .byte PAN , c_v-5 - .byte BEND , c_v+30 - .byte W03 - .byte PAN , c_v+15 - .byte BEND , c_v+39 - .byte W03 - .byte PAN , c_v-15 - .byte BEND , c_v+54 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte W21 - .byte FINE - -@********************** Track 2 **********************@ - -se_w013_2: - .byte KEYSH , se_w013_key+0 - .byte VOICE , 5 - .byte PAN , c_v+0 - .byte VOL , 110*se_w013_mvl/mxv - .byte N06 , Fn3 , v040 - .byte W09 - .byte N24 , Gn3 - .byte W15 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_w013: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w013_pri @ Priority - .byte se_w013_rev @ Reverb. - - .word se_w013_grp - - .word se_w013_1 - .word se_w013_2 - - .end |