diff --git a/ld_script.txt b/ld_script.txt index 2299e1279..67a3a256b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -794,7 +794,7 @@ SECTIONS { sound/songs/se_w017.o(.rodata); sound/songs/se_w019.o(.rodata); sound/songs/se_w028.o(.rodata); - sound/songs/se_w013b.o(.rodata); + sound/songs/midi/se_w013b.o(.rodata); sound/songs/se_w044.o(.rodata); sound/songs/se_w029.o(.rodata); sound/songs/se_w057.o(.rodata); diff --git a/songs.mk b/songs.mk index 937d872ad..33ed0435f 100644 --- a/songs.mk +++ b/songs.mk @@ -1209,5 +1209,8 @@ $(MID_SUBDIR)/se_w011.s: %.s: %.mid $(MID_SUBDIR)/se_w013.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_w013b.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_w013b.mid b/sound/songs/midi/se_w013b.mid new file mode 100644 index 000000000..09e8d4c5d Binary files /dev/null and b/sound/songs/midi/se_w013b.mid differ diff --git a/sound/songs/se_w013b.s b/sound/songs/se_w013b.s deleted file mode 100644 index e78c3057b..000000000 --- a/sound/songs/se_w013b.s +++ /dev/null @@ -1,62 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w013b_grp, voicegroup128 - .equ se_w013b_pri, 4 - .equ se_w013b_rev, reverb_set+50 - .equ se_w013b_mvl, 127 - .equ se_w013b_key, 0 - .equ se_w013b_tbs, 1 - .equ se_w013b_exg, 0 - .equ se_w013b_cmp, 1 - - .section .rodata - .global se_w013b - .align 2 - -@********************** Track 1 **********************@ - -se_w013b_1: - .byte KEYSH , se_w013b_key+0 - .byte TEMPO , 250*se_w013b_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 90*se_w013b_mvl/mxv - .byte BEND , c_v+0 - .byte N14 , An4 , v108 - .byte W03 - .byte PAN , c_v+5 - .byte BEND , c_v+6 - .byte W01 - .byte VOL , 80*se_w013b_mvl/mxv - .byte W02 - .byte PAN , c_v+15 - .byte BEND , c_v+1 - .byte W01 - .byte VOL , 64*se_w013b_mvl/mxv - .byte W02 - .byte PAN , c_v+6 - .byte VOL , 38*se_w013b_mvl/mxv - .byte BEND , c_v-9 - .byte W02 - .byte c_v-34 - .byte W01 - .byte PAN , c_v-1 - .byte VOL , 11*se_w013b_mvl/mxv - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_w013b: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w013b_pri @ Priority - .byte se_w013b_rev @ Reverb. - - .word se_w013b_grp - - .word se_w013b_1 - - .end