diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 16:47:25 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | 2ac7d8282b91dd680c6e31a31a06f4fa9e5ff8d5 (patch) | |
| tree | f9e7aaeb40db6e35e11d8b642eb70e64a210b68d | |
| parent | 47c9bd4189fc700cf19018f427dd4621e0115ba9 (diff) | |
Match se_w010.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w010.mid | bin | 0 -> 153 bytes | |||
| -rw-r--r-- | sound/songs/se_w010.s | 70 |
4 files changed, 4 insertions, 71 deletions
diff --git a/ld_script.txt b/ld_script.txt index 8606a018f..b2c8afdc8 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -789,7 +789,7 @@ SECTIONS { sound/songs/se_w036.o(.rodata); sound/songs/se_w059.o(.rodata); sound/songs/se_w059b.o(.rodata); - sound/songs/se_w010.o(.rodata); + sound/songs/midi/se_w010.o(.rodata); sound/songs/se_w011.o(.rodata); sound/songs/se_w017.o(.rodata); sound/songs/se_w019.o(.rodata); @@ -1200,5 +1200,8 @@ $(MID_SUBDIR)/se_w006.s: %.s: %.mid $(MID_SUBDIR)/se_w007.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_w010.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_w010.mid b/sound/songs/midi/se_w010.mid Binary files differnew file mode 100644 index 000000000..4b3c1cfcf --- /dev/null +++ b/sound/songs/midi/se_w010.mid diff --git a/sound/songs/se_w010.s b/sound/songs/se_w010.s deleted file mode 100644 index 7df3dbd3f..000000000 --- a/sound/songs/se_w010.s +++ /dev/null @@ -1,70 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w010_grp, voicegroup128 - .equ se_w010_pri, 4 - .equ se_w010_rev, reverb_set+50 - .equ se_w010_mvl, 127 - .equ se_w010_key, 0 - .equ se_w010_tbs, 1 - .equ se_w010_exg, 0 - .equ se_w010_cmp, 1 - - .section .rodata - .global se_w010 - .align 2 - -@********************** Track 1 **********************@ - -se_w010_1: - .byte KEYSH , se_w010_key+0 - .byte TEMPO , 220*se_w010_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte PAN , c_v+14 - .byte VOL , 42*se_w010_mvl/mxv - .byte BEND , c_v+39 - .byte N10 , Gn5 , v092 - .byte W01 - .byte VOL , 55*se_w010_mvl/mxv - .byte W01 - .byte 71*se_w010_mvl/mxv - .byte BEND , c_v+23 - .byte W01 - .byte PAN , c_v-15 - .byte VOL , 86*se_w010_mvl/mxv - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 110*se_w010_mvl/mxv - .byte BEND , c_v-23 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-34 - .byte W01 - .byte c_v-55 - .byte W01 - .byte c_v-64 - .byte W02 - .byte VOICE , 21 - .byte BEND , c_v+63 - .byte N01 , Cn5 - .byte W02 - .byte Gn5 - .byte W02 - .byte Gn5 , v064 - .byte W10 - .byte FINE - -@******************************************************@ - .align 2 - -se_w010: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w010_pri @ Priority - .byte se_w010_rev @ Reverb. - - .word se_w010_grp - - .word se_w010_1 - - .end |