diff --git a/ld_script.txt b/ld_script.txt index 3d80eed76d..6be682f6e4 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -661,7 +661,7 @@ SECTIONS { sound/songs/midi/se_jyuni.o(.rodata); sound/songs/midi/se_a.o(.rodata); sound/songs/midi/se_i.o(.rodata); - sound/songs/se_u.o(.rodata); + sound/songs/midi/se_u.o(.rodata); sound/songs/midi/se_e.o(.rodata); sound/songs/midi/se_o.o(.rodata); sound/songs/midi/se_n.o(.rodata); diff --git a/songs.mk b/songs.mk index aaacea72bd..11737ca3a1 100644 --- a/songs.mk +++ b/songs.mk @@ -1182,5 +1182,8 @@ $(MID_SUBDIR)/se_track_stop.s: %.s: %.mid $(MID_SUBDIR)/se_tu_saa.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 +$(MID_SUBDIR)/se_u.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_u.mid b/sound/songs/midi/se_u.mid new file mode 100644 index 0000000000..0e145e3a23 Binary files /dev/null and b/sound/songs/midi/se_u.mid differ diff --git a/sound/songs/se_u.s b/sound/songs/se_u.s deleted file mode 100644 index e39a7e0e05..0000000000 --- a/sound/songs/se_u.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_u_grp, voicegroup128 - .equ se_u_pri, 4 - .equ se_u_rev, reverb_set+50 - .equ se_u_mvl, 127 - .equ se_u_key, 0 - .equ se_u_tbs, 1 - .equ se_u_exg, 0 - .equ se_u_cmp, 1 - - .section .rodata - .global se_u - .align 2 - -@********************** Track 1 **********************@ - -se_u_1: - .byte KEYSH , se_u_key+0 - .byte TEMPO , 240*se_u_tbs/2 - .byte VOICE , 124 - .byte BENDR , 12 - .byte VOL , 127*se_u_mvl/mxv - .byte BEND , c_v+0 - .byte N72 , Cn3 , v127 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_u: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_u_pri @ Priority - .byte se_u_rev @ Reverb. - - .word se_u_grp - - .word se_u_1 - - .end