diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 17:23:38 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | 285608666b730ec5f0000b59bbaca7ac6270bae9 (patch) | |
| tree | 0e64ea9e0fbfd59eb22770eb83c6bb3abcf33894 | |
| parent | 7cb1345cba7eb40a6ae31906c13fdccca015d0d1 (diff) | |
Match se_w043.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w043.mid | bin | 0 -> 245 bytes | |||
| -rw-r--r-- | sound/songs/se_w043.s | 105 |
4 files changed, 4 insertions, 106 deletions
diff --git a/ld_script.txt b/ld_script.txt index 1d1079ec9..d5d894528 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -826,7 +826,7 @@ SECTIONS { sound/songs/se_w060.o(.rodata); sound/songs/se_w185.o(.rodata); sound/songs/midi/se_w014.o(.rodata); - sound/songs/se_w043.o(.rodata); + sound/songs/midi/se_w043.o(.rodata); sound/songs/se_w207.o(.rodata); sound/songs/se_w207b.o(.rodata); sound/songs/se_w215.o(.rodata); @@ -1257,5 +1257,8 @@ $(MID_SUBDIR)/se_w036.s: %.s: %.mid $(MID_SUBDIR)/se_w039.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_w043.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_w043.mid b/sound/songs/midi/se_w043.mid Binary files differnew file mode 100644 index 000000000..b44876722 --- /dev/null +++ b/sound/songs/midi/se_w043.mid diff --git a/sound/songs/se_w043.s b/sound/songs/se_w043.s deleted file mode 100644 index 85abb295e..000000000 --- a/sound/songs/se_w043.s +++ /dev/null @@ -1,105 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w043_grp, voicegroup128 - .equ se_w043_pri, 4 - .equ se_w043_rev, reverb_set+50 - .equ se_w043_mvl, 127 - .equ se_w043_key, 0 - .equ se_w043_tbs, 1 - .equ se_w043_exg, 0 - .equ se_w043_cmp, 1 - - .section .rodata - .global se_w043 - .align 2 - -@********************** Track 1 **********************@ - -se_w043_1: - .byte KEYSH , se_w043_key+0 - .byte TEMPO , 150*se_w043_tbs/2 - .byte VOICE , 18 - .byte VOL , 110*se_w043_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , En3 , v124 - .byte W02 - .byte As3 - .byte W04 - .byte W01 - .byte N03 , En3 , v092 - .byte W05 - .byte W04 - .byte PAN , c_v-6 - .byte N02 , En3 , v076 - .byte W02 - .byte W01 - .byte PAN , c_v+6 - .byte N02 , As3 - .byte W05 - .byte PAN , c_v+0 - .byte N03 , En3 , v052 - .byte W06 - .byte W03 - .byte PAN , c_v-12 - .byte N02 , En3 , v056 - .byte W03 - .byte PAN , c_v+10 - .byte N02 , As3 - .byte W04 - .byte PAN , c_v+0 - .byte N03 , En3 , v032 - .byte W02 - .byte W06 - .byte W01 - .byte PAN , c_v-16 - .byte N02 , En3 , v044 - .byte W02 - .byte PAN , c_v+16 - .byte N02 , As3 - .byte W03 - .byte W02 - .byte PAN , c_v+0 - .byte N03 , En3 , v020 - .byte W04 - .byte FINE - -@********************** Track 2 **********************@ - -se_w043_2: - .byte KEYSH , se_w043_key+0 - .byte VOICE , 5 - .byte VOL , 110*se_w043_mvl/mxv - .byte N01 , Cn3 , v040 - .byte W03 - .byte En3 - .byte W03 - .byte W01 - .byte Gn3 - .byte W05 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w043: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w043_pri @ Priority - .byte se_w043_rev @ Reverb. - - .word se_w043_grp - - .word se_w043_1 - .word se_w043_2 - - .end |