diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 16:59:08 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | a2cb1991c5ff7d31b539048b2e0d621464eee140 (patch) | |
| tree | 58b524074294c6eabd2205fcc81677cb954b0841 | |
| parent | d9b29ec549e69d462ae31c3727365bdc9a781224 (diff) | |
Match se_w016.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w016.mid | bin | 0 -> 218 bytes | |||
| -rw-r--r-- | sound/songs/se_w016.s | 103 |
4 files changed, 4 insertions, 104 deletions
diff --git a/ld_script.txt b/ld_script.txt index 7337b6b1d..17eeaeef3 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -766,7 +766,7 @@ SECTIONS { sound/songs/se_w081.o(.rodata); sound/songs/se_w081b.o(.rodata); sound/songs/se_w088.o(.rodata); - sound/songs/se_w016.o(.rodata); + sound/songs/midi/se_w016.o(.rodata); sound/songs/se_w016b.o(.rodata); sound/songs/midi/se_w003.o(.rodata); sound/songs/se_w104.o(.rodata); @@ -1218,5 +1218,8 @@ $(MID_SUBDIR)/se_w014.s: %.s: %.mid $(MID_SUBDIR)/se_w015.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 +$(MID_SUBDIR)/se_w016.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_w016.mid b/sound/songs/midi/se_w016.mid Binary files differnew file mode 100644 index 000000000..8bf167109 --- /dev/null +++ b/sound/songs/midi/se_w016.mid diff --git a/sound/songs/se_w016.s b/sound/songs/se_w016.s deleted file mode 100644 index a34957c88..000000000 --- a/sound/songs/se_w016.s +++ /dev/null @@ -1,103 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w016_grp, voicegroup128 - .equ se_w016_pri, 4 - .equ se_w016_rev, reverb_set+50 - .equ se_w016_mvl, 127 - .equ se_w016_key, 0 - .equ se_w016_tbs, 1 - .equ se_w016_exg, 0 - .equ se_w016_cmp, 1 - - .section .rodata - .global se_w016 - .align 2 - -@********************** Track 1 **********************@ - -se_w016_1: - .byte KEYSH , se_w016_key+0 - .byte TEMPO , 150*se_w016_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 64*se_w016_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Cn3 , v108 - .byte W03 - .byte VOL , 79*se_w016_mvl/mxv - .byte BEND , c_v+22 - .byte W02 - .byte c_v+8 - .byte W01 - .byte VOL , 84*se_w016_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte VOL , 91*se_w016_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 100*se_w016_mvl/mxv - .byte PAN , c_v-8 - .byte W03 - .byte VOL , 110*se_w016_mvl/mxv - .byte W03 - .byte PAN , c_v-12 - .byte W06 -se_w016_1_B1: - .byte PAN , c_v-17 - .byte BEND , c_v+0 - .byte N48 , Cn3 , v108 - .byte W03 - .byte BEND , c_v-7 - .byte W03 - .byte PAN , c_v-9 - .byte BEND , c_v-12 - .byte W03 - .byte c_v-20 - .byte W03 - .byte PAN , c_v-3 - .byte W03 - .byte c_v+6 - .byte BEND , c_v-13 - .byte W03 - .byte PAN , c_v+10 - .byte W03 - .byte BEND , c_v-6 - .byte W03 - .byte PAN , c_v+16 - .byte W03 - .byte BEND , c_v+6 - .byte W03 - .byte PAN , c_v+13 - .byte BEND , c_v+11 - .byte W03 - .byte c_v+20 - .byte W03 - .byte PAN , c_v+8 - .byte W03 - .byte c_v+0 - .byte BEND , c_v+12 - .byte W03 - .byte PAN , c_v-8 - .byte BEND , c_v+7 - .byte W03 - .byte PAN , c_v-11 - .byte W03 - .byte GOTO - .word se_w016_1_B1 - .byte FINE - -@******************************************************@ - .align 2 - -se_w016: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w016_pri @ Priority - .byte se_w016_rev @ Reverb. - - .word se_w016_grp - - .word se_w016_1 - - .end |