diff --git a/ld_script.txt b/ld_script.txt index 43a556034..7814be677 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -589,7 +589,7 @@ SECTIONS { sound/songs/se_boo.o(.rodata); sound/songs/se_bowa.o(.rodata); sound/songs/se_jyuni.o(.rodata); - sound/songs/se_a.o(.rodata); + sound/songs/midi/se_a.o(.rodata); sound/songs/se_i.o(.rodata); sound/songs/se_u.o(.rodata); sound/songs/se_e.o(.rodata); diff --git a/songs.mk b/songs.mk index fb0d6b504..f2f358234 100644 --- a/songs.mk +++ b/songs.mk @@ -786,5 +786,8 @@ $(MID_SUBDIR)/ph_trap_held.s: %.s: %.mid $(MID_SUBDIR)/ph_trap_solo.s: %.s: %.mid $(MID) $< $@ -E -G130 -P4 +$(MID_SUBDIR)/se_a.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_a.mid b/sound/songs/midi/se_a.mid new file mode 100644 index 000000000..e44a27926 Binary files /dev/null and b/sound/songs/midi/se_a.mid differ diff --git a/sound/songs/se_a.s b/sound/songs/se_a.s deleted file mode 100644 index 860a9aa27..000000000 --- a/sound/songs/se_a.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_a_grp, voicegroup128 - .equ se_a_pri, 4 - .equ se_a_rev, reverb_set+50 - .equ se_a_mvl, 127 - .equ se_a_key, 0 - .equ se_a_tbs, 1 - .equ se_a_exg, 0 - .equ se_a_cmp, 1 - - .section .rodata - .global se_a - .align 2 - -@********************** Track 1 **********************@ - -se_a_1: - .byte KEYSH , se_a_key+0 - .byte TEMPO , 240*se_a_tbs/2 - .byte VOICE , 122 - .byte BENDR , 12 - .byte VOL , 95*se_a_mvl/mxv - .byte BEND , c_v+0 - .byte N72 , Cn3 , v127 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_a: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_a_pri @ Priority - .byte se_a_rev @ Reverb. - - .word se_a_grp - - .word se_a_1 - - .end