diff --git a/ld_script.txt b/ld_script.txt index 14f0be417..f7dbccf45 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -655,7 +655,7 @@ SECTIONS { sound/songs/midi/se_fu_zaku.o(.rodata); sound/songs/midi/se_fu_zaku2.o(.rodata); sound/songs/midi/se_fu_zuzuzu.o(.rodata); - sound/songs/se_ru_gashin.o(.rodata); + sound/songs/midi/se_ru_gashin.o(.rodata); sound/songs/se_ru_gasyan.o(.rodata); sound/songs/midi/se_ru_bari.o(.rodata); sound/songs/se_ru_hyuu.o(.rodata); diff --git a/songs.mk b/songs.mk index 6891acd9b..25e0f9ff1 100644 --- a/songs.mk +++ b/songs.mk @@ -1056,5 +1056,8 @@ $(MID_SUBDIR)/se_rg_w_door.s: %.s: %.mid $(MID_SUBDIR)/se_ru_bari.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4 +$(MID_SUBDIR)/se_ru_gashin.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_ru_gashin.mid b/sound/songs/midi/se_ru_gashin.mid new file mode 100644 index 000000000..ae29a385b Binary files /dev/null and b/sound/songs/midi/se_ru_gashin.mid differ diff --git a/sound/songs/se_ru_gashin.s b/sound/songs/se_ru_gashin.s deleted file mode 100644 index 1c9158cbd..000000000 --- a/sound/songs/se_ru_gashin.s +++ /dev/null @@ -1,64 +0,0 @@ - .include "MPlayDef.s" - - .equ se_ru_gashin_grp, voicegroup128 - .equ se_ru_gashin_pri, 4 - .equ se_ru_gashin_rev, reverb_set+50 - .equ se_ru_gashin_mvl, 127 - .equ se_ru_gashin_key, 0 - .equ se_ru_gashin_tbs, 1 - .equ se_ru_gashin_exg, 0 - .equ se_ru_gashin_cmp, 1 - - .section .rodata - .global se_ru_gashin - .align 2 - -@********************** Track 1 **********************@ - -se_ru_gashin_1: - .byte KEYSH , se_ru_gashin_key+0 - .byte TEMPO , 150*se_ru_gashin_tbs/2 - .byte VOICE , 3 - .byte VOL , 90*se_ru_gashin_mvl/mxv - .byte BEND , c_v+16 - .byte N03 , En3 , v112 - .byte W01 - .byte BEND , c_v+38 - .byte W01 - .byte c_v+62 - .byte W02 - .byte N12 , En4 - .byte W02 - .byte W06 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_ru_gashin_2: - .byte KEYSH , se_ru_gashin_key+0 - .byte VOICE , 4 - .byte VOL , 90*se_ru_gashin_mvl/mxv - .byte N03 , Gs3 , v096 - .byte W04 - .byte N12 , Gs4 - .byte W02 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_ru_gashin: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_ru_gashin_pri @ Priority - .byte se_ru_gashin_rev @ Reverb. - - .word se_ru_gashin_grp - - .word se_ru_gashin_1 - .word se_ru_gashin_2 - - .end