diff --git a/ld_script.txt b/ld_script.txt index 746ed9e51..ed31037d7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -702,7 +702,7 @@ SECTIONS { sound/songs/se_t_ooame_e.o(.rodata); sound/songs/midi/se_t_koame.o(.rodata); sound/songs/se_t_koame_e.o(.rodata); - sound/songs/se_t_kami.o(.rodata); + sound/songs/midi/se_t_kami.o(.rodata); sound/songs/se_t_kami2.o(.rodata); sound/songs/midi/se_elebeta.o(.rodata); sound/songs/midi/se_hinsi.o(.rodata); diff --git a/songs.mk b/songs.mk index b320d0a15..aac11ad7b 100644 --- a/songs.mk +++ b/songs.mk @@ -1083,6 +1083,9 @@ $(MID_SUBDIR)/se_t_ame.s: %.s: %.mid $(MID_SUBDIR)/se_t_ame_e.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 +$(MID_SUBDIR)/se_t_kami.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3 + $(MID_SUBDIR)/se_t_koame.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 diff --git a/sound/songs/midi/se_t_kami.mid b/sound/songs/midi/se_t_kami.mid new file mode 100644 index 000000000..71d8163bd Binary files /dev/null and b/sound/songs/midi/se_t_kami.mid differ diff --git a/sound/songs/se_t_kami.s b/sound/songs/se_t_kami.s deleted file mode 100644 index 6ac8ae06f..000000000 --- a/sound/songs/se_t_kami.s +++ /dev/null @@ -1,98 +0,0 @@ - .include "MPlayDef.s" - - .equ se_t_kami_grp, voicegroup128 - .equ se_t_kami_pri, 3 - .equ se_t_kami_rev, reverb_set+50 - .equ se_t_kami_mvl, 127 - .equ se_t_kami_key, 0 - .equ se_t_kami_tbs, 1 - .equ se_t_kami_exg, 0 - .equ se_t_kami_cmp, 1 - - .section .rodata - .global se_t_kami - .align 2 - -@********************** Track 1 **********************@ - -se_t_kami_1: - .byte KEYSH , se_t_kami_key+0 - .byte TEMPO , 220*se_t_kami_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_t_kami_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , En3 , v112 - .byte W03 - .byte BEND , c_v+21 - .byte W03 - .byte c_v+0 - .byte W03 - .byte c_v+6 - .byte N15 , En3 , v120 - .byte W03 - .byte BEND , c_v+2 - .byte W03 - .byte c_v-9 - .byte W03 - .byte c_v-29 - .byte W06 - .byte c_v+0 - .byte N09 , Gn2 - .byte W06 - .byte BEND , c_v-8 - .byte W03 - .byte c_v-15 - .byte TIE , Gs2 , v112 - .byte W03 - .byte BEND , c_v-4 - .byte W09 - .byte c_v-8 - .byte W03 - .byte W06 - .byte c_v-13 - .byte W03 - .byte c_v-22 - .byte W09 - .byte c_v-32 - .byte W06 - .byte VOL , 102*se_t_kami_mvl/mxv - .byte BEND , c_v-38 - .byte W09 - .byte VOL , 97*se_t_kami_mvl/mxv - .byte W09 - .byte 92*se_t_kami_mvl/mxv - .byte BEND , c_v-45 - .byte W06 - .byte W03 - .byte VOL , 83*se_t_kami_mvl/mxv - .byte W06 - .byte BEND , c_v-52 - .byte W03 - .byte VOL , 72*se_t_kami_mvl/mxv - .byte W09 - .byte 63*se_t_kami_mvl/mxv - .byte W03 - .byte W06 - .byte 57*se_t_kami_mvl/mxv - .byte W06 - .byte 46*se_t_kami_mvl/mxv - .byte W12 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_t_kami: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_t_kami_pri @ Priority - .byte se_t_kami_rev @ Reverb. - - .word se_t_kami_grp - - .word se_t_kami_1 - - .end