diff --git a/ld_script.txt b/ld_script.txt index 79cb12e92..295ec335e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -646,7 +646,7 @@ SECTIONS { sound/songs/midi/se_e.o(.rodata); sound/songs/midi/se_o.o(.rodata); sound/songs/midi/se_n.o(.rodata); - sound/songs/se_seikai.o(.rodata); + sound/songs/midi/se_seikai.o(.rodata); sound/songs/midi/se_hazure.o(.rodata); sound/songs/midi/se_exp.o(.rodata); sound/songs/midi/se_jite_pyoko.o(.rodata); diff --git a/songs.mk b/songs.mk index c7482de6a..1704e2891 100644 --- a/songs.mk +++ b/songs.mk @@ -1068,5 +1068,8 @@ $(MID_SUBDIR)/se_ru_hyuu.s: %.s: %.mid $(MID_SUBDIR)/se_save.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P5 +$(MID_SUBDIR)/se_seikai.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_seikai.mid b/sound/songs/midi/se_seikai.mid new file mode 100644 index 000000000..32bfa07a8 Binary files /dev/null and b/sound/songs/midi/se_seikai.mid differ diff --git a/sound/songs/se_seikai.s b/sound/songs/se_seikai.s deleted file mode 100644 index a3f27b6cd..000000000 --- a/sound/songs/se_seikai.s +++ /dev/null @@ -1,44 +0,0 @@ - .include "MPlayDef.s" - - .equ se_seikai_grp, voicegroup127 - .equ se_seikai_pri, 4 - .equ se_seikai_rev, reverb_set+50 - .equ se_seikai_mvl, 127 - .equ se_seikai_key, 0 - .equ se_seikai_tbs, 1 - .equ se_seikai_exg, 0 - .equ se_seikai_cmp, 1 - - .section .rodata - .global se_seikai - .align 2 - -@********************** Track 1 **********************@ - -se_seikai_1: - .byte KEYSH , se_seikai_key+0 - .byte TEMPO , 240*se_seikai_tbs/2 - .byte VOICE , 5 - .byte BENDR , 12 - .byte VOL , 80*se_seikai_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Gn5 , v127 - .byte W06 - .byte N18 , Ds5 - .byte W18 - .byte FINE - -@******************************************************@ - .align 2 - -se_seikai: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_seikai_pri @ Priority - .byte se_seikai_rev @ Reverb. - - .word se_seikai_grp - - .word se_seikai_1 - - .end