diff --git a/ld_script.txt b/ld_script.txt index 16596f7ac..138590628 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -565,7 +565,7 @@ SECTIONS { ALIGN(4) { sound/songs/midi/mus_dummy.o(.rodata); - sound/songs/se_kaifuku.o(.rodata); + sound/songs/midi/se_kaifuku.o(.rodata); sound/songs/se_pc_login.o(.rodata); sound/songs/se_pc_off.o(.rodata); sound/songs/se_pc_on.o(.rodata); diff --git a/songs.mk b/songs.mk index 4e9ad717a..fdeaf431f 100644 --- a/songs.mk +++ b/songs.mk @@ -924,5 +924,8 @@ $(MID_SUBDIR)/se_jyuni.s: %.s: %.mid $(MID_SUBDIR)/se_kaidan.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P5 +$(MID_SUBDIR)/se_kaifuku.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_kaifuku.mid b/sound/songs/midi/se_kaifuku.mid new file mode 100644 index 000000000..4375a705d Binary files /dev/null and b/sound/songs/midi/se_kaifuku.mid differ diff --git a/sound/songs/se_kaifuku.s b/sound/songs/se_kaifuku.s deleted file mode 100644 index ecaf63c92..000000000 --- a/sound/songs/se_kaifuku.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kaifuku_grp, voicegroup127 - .equ se_kaifuku_pri, 5 - .equ se_kaifuku_rev, reverb_set+50 - .equ se_kaifuku_mvl, 127 - .equ se_kaifuku_key, 0 - .equ se_kaifuku_tbs, 1 - .equ se_kaifuku_exg, 0 - .equ se_kaifuku_cmp, 1 - - .section .rodata - .global se_kaifuku - .align 2 - -@********************** Track 1 **********************@ - -se_kaifuku_1: - .byte KEYSH , se_kaifuku_key+0 - .byte TEMPO , 132*se_kaifuku_tbs/2 - .byte VOICE , 91 - .byte VOL , 100*se_kaifuku_mvl/mxv - .byte BEND , c_v-6 - .byte N02 , Cn3 , v112 - .byte W04 - .byte N02 - .byte W04 - .byte VOICE , 90 - .byte N15 - .byte W16 - .byte FINE - -@******************************************************@ - .align 2 - -se_kaifuku: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_kaifuku_pri @ Priority - .byte se_kaifuku_rev @ Reverb. - - .word se_kaifuku_grp - - .word se_kaifuku_1 - - .end