diff --git a/ld_script.txt b/ld_script.txt index c2b66abc8..fb33456bd 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -586,7 +586,7 @@ SECTIONS { sound/songs/se_naminori.o(.rodata); sound/songs/midi/se_ban.o(.rodata); sound/songs/se_pin.o(.rodata); - sound/songs/se_boo.o(.rodata); + sound/songs/midi/se_boo.o(.rodata); sound/songs/se_bowa.o(.rodata); sound/songs/se_jyuni.o(.rodata); sound/songs/midi/se_a.o(.rodata); diff --git a/songs.mk b/songs.mk index 7ec2151a3..ed3a58496 100644 --- a/songs.mk +++ b/songs.mk @@ -798,5 +798,8 @@ $(MID_SUBDIR)/se_basabasa.s: %.s: %.mid $(MID_SUBDIR)/se_bidoro.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5 +$(MID_SUBDIR)/se_boo.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_boo.mid b/sound/songs/midi/se_boo.mid new file mode 100644 index 000000000..89eb130b9 Binary files /dev/null and b/sound/songs/midi/se_boo.mid differ diff --git a/sound/songs/se_boo.s b/sound/songs/se_boo.s deleted file mode 100644 index c6bb1cb06..000000000 --- a/sound/songs/se_boo.s +++ /dev/null @@ -1,47 +0,0 @@ - .include "MPlayDef.s" - - .equ se_boo_grp, voicegroup127 - .equ se_boo_pri, 4 - .equ se_boo_rev, reverb_set+50 - .equ se_boo_mvl, 127 - .equ se_boo_key, 0 - .equ se_boo_tbs, 1 - .equ se_boo_exg, 0 - .equ se_boo_cmp, 1 - - .section .rodata - .global se_boo - .align 2 - -@********************** Track 1 **********************@ - -se_boo_1: - .byte KEYSH , se_boo_key+0 - .byte TEMPO , 100*se_boo_tbs/2 - .byte VOICE , 5 - .byte BENDR , 12 - .byte VOL , 110*se_boo_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Cn3 , v127 - .byte W03 - .byte Cn2 , v112 - .byte W03 - .byte W03 - .byte Cn2 , v024 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_boo: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_boo_pri @ Priority - .byte se_boo_rev @ Reverb. - - .word se_boo_grp - - .word se_boo_1 - - .end