diff --git a/ld_script.txt b/ld_script.txt index 992cba9679..8346c6ce9e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -654,7 +654,7 @@ SECTIONS { sound/songs/se_t_kami.o(.rodata); sound/songs/se_t_kami2.o(.rodata); sound/songs/midi/se_elebeta.o(.rodata); - sound/songs/se_hinsi.o(.rodata); + sound/songs/midi/se_hinsi.o(.rodata); sound/songs/midi/se_expmax.o(.rodata); sound/songs/se_tamakoro.o(.rodata); sound/songs/se_tamakoro_e.o(.rodata); diff --git a/songs.mk b/songs.mk index 873657dca0..ecd18722fe 100644 --- a/songs.mk +++ b/songs.mk @@ -900,5 +900,8 @@ $(MID_SUBDIR)/se_hazure.s: %.s: %.mid $(MID_SUBDIR)/se_hi_turun.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 +$(MID_SUBDIR)/se_hinsi.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P3 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_hinsi.mid b/sound/songs/midi/se_hinsi.mid new file mode 100644 index 0000000000..3676a4a044 Binary files /dev/null and b/sound/songs/midi/se_hinsi.mid differ diff --git a/sound/songs/se_hinsi.s b/sound/songs/se_hinsi.s deleted file mode 100644 index 3c16f2f1b6..0000000000 --- a/sound/songs/se_hinsi.s +++ /dev/null @@ -1,50 +0,0 @@ - .include "MPlayDef.s" - - .equ se_hinsi_grp, voicegroup127 - .equ se_hinsi_pri, 3 - .equ se_hinsi_rev, reverb_set+50 - .equ se_hinsi_mvl, 127 - .equ se_hinsi_key, 0 - .equ se_hinsi_tbs, 1 - .equ se_hinsi_exg, 0 - .equ se_hinsi_cmp, 1 - - .section .rodata - .global se_hinsi - .align 2 - -@********************** Track 1 **********************@ - -se_hinsi_1: - .byte KEYSH , se_hinsi_key+0 -se_hinsi_1_B1: - .byte TEMPO , 150*se_hinsi_tbs/2 - .byte VOICE , 15 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 100*se_hinsi_mvl/mxv - .byte BEND , c_v+17 - .byte N12 , Dn4 , v080 - .byte W12 - .byte BEND , c_v+31 - .byte N12 , An3 - .byte W12 - .byte W12 - .byte GOTO - .word se_hinsi_1_B1 - .byte FINE - -@******************************************************@ - .align 2 - -se_hinsi: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_hinsi_pri @ Priority - .byte se_hinsi_rev @ Reverb. - - .word se_hinsi_grp - - .word se_hinsi_1 - - .end