diff --git a/ld_script.txt b/ld_script.txt index b2c8afdc8..b7932314c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -790,7 +790,7 @@ SECTIONS { sound/songs/se_w059.o(.rodata); sound/songs/se_w059b.o(.rodata); sound/songs/midi/se_w010.o(.rodata); - sound/songs/se_w011.o(.rodata); + sound/songs/midi/se_w011.o(.rodata); sound/songs/se_w017.o(.rodata); sound/songs/se_w019.o(.rodata); sound/songs/se_w028.o(.rodata); diff --git a/songs.mk b/songs.mk index d857e5703..52a22325a 100644 --- a/songs.mk +++ b/songs.mk @@ -1203,5 +1203,8 @@ $(MID_SUBDIR)/se_w007.s: %.s: %.mid $(MID_SUBDIR)/se_w010.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_w011.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_w011.mid b/sound/songs/midi/se_w011.mid new file mode 100644 index 000000000..703ae492b Binary files /dev/null and b/sound/songs/midi/se_w011.mid differ diff --git a/sound/songs/se_w011.s b/sound/songs/se_w011.s deleted file mode 100644 index 05e6c04dd..000000000 --- a/sound/songs/se_w011.s +++ /dev/null @@ -1,89 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w011_grp, voicegroup128 - .equ se_w011_pri, 4 - .equ se_w011_rev, reverb_set+50 - .equ se_w011_mvl, 127 - .equ se_w011_key, 0 - .equ se_w011_tbs, 1 - .equ se_w011_exg, 0 - .equ se_w011_cmp, 1 - - .section .rodata - .global se_w011 - .align 2 - -@********************** Track 1 **********************@ - -se_w011_1: - .byte KEYSH , se_w011_key+0 - .byte TEMPO , 220*se_w011_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte PAN , c_v+4 - .byte VOL , 42*se_w011_mvl/mxv - .byte BEND , c_v+39 - .byte N06 , Cn5 , v084 - .byte W01 - .byte VOL , 55*se_w011_mvl/mxv - .byte BEND , c_v+18 - .byte W01 - .byte VOL , 71*se_w011_mvl/mxv - .byte BEND , c_v+0 - .byte W01 - .byte PAN , c_v-4 - .byte VOL , 86*se_w011_mvl/mxv - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 110*se_w011_mvl/mxv - .byte BEND , c_v-50 - .byte W02 - .byte PAN , c_v+0 - .byte W04 - .byte VOICE , 8 - .byte PAN , c_v-11 - .byte BEND , c_v+0 - .byte N06 , Gn4 , v120 - .byte W02 - .byte PAN , c_v+11 - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-26 - .byte W01 - .byte PAN , c_v-12 - .byte BEND , c_v-46 - .byte W01 - .byte PAN , c_v+11 - .byte BEND , c_v-54 - .byte W09 - .byte FINE - -@********************** Track 2 **********************@ - -se_w011_2: - .byte KEYSH , se_w011_key+0 - .byte VOICE , 27 - .byte VOL , 110*se_w011_mvl/mxv - .byte PAN , c_v+0 - .byte N06 , Cn2 , v040 - .byte W10 - .byte N02 , Gn2 - .byte W14 - .byte FINE - -@******************************************************@ - .align 2 - -se_w011: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w011_pri @ Priority - .byte se_w011_rev @ Reverb. - - .word se_w011_grp - - .word se_w011_1 - .word se_w011_2 - - .end