From 695d42bf46f21ba729773bf46e586566e5f27783 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:41:40 -0400 Subject: [PATCH] Match se_kon3.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_kon3.mid | Bin 0 -> 103 bytes sound/songs/se_kon3.s | 53 ----------------------------------- 4 files changed, 4 insertions(+), 54 deletions(-) create mode 100644 sound/songs/midi/se_kon3.mid delete mode 100644 sound/songs/se_kon3.s diff --git a/ld_script.txt b/ld_script.txt index aaf08d0420..e961e34817 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -622,7 +622,7 @@ SECTIONS { sound/songs/se_save.o(.rodata); sound/songs/midi/se_kon.o(.rodata); sound/songs/midi/se_kon2.o(.rodata); - sound/songs/se_kon3.o(.rodata); + sound/songs/midi/se_kon3.o(.rodata); sound/songs/se_kon4.o(.rodata); sound/songs/se_suikomu.o(.rodata); sound/songs/se_nageru.o(.rodata); diff --git a/songs.mk b/songs.mk index b9466256da..f6ed42a17a 100644 --- a/songs.mk +++ b/songs.mk @@ -936,5 +936,8 @@ $(MID_SUBDIR)/se_kon.s: %.s: %.mid $(MID_SUBDIR)/se_kon2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_kon3.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_kon3.mid b/sound/songs/midi/se_kon3.mid new file mode 100644 index 0000000000000000000000000000000000000000..fc35f1931c9c4f7b3961c19d3025363016c41539 GIT binary patch literal 103 zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdGD~nU{10SilWJi2ug?IL5@$Fdz_5Y6 op5Xz5Bf|vW2%ZLC1{CRof(#ph(hnIN7$*99a5nlfFavc10AG|BrT_o{ literal 0 HcmV?d00001 diff --git a/sound/songs/se_kon3.s b/sound/songs/se_kon3.s deleted file mode 100644 index 4e5ee26fac..0000000000 --- a/sound/songs/se_kon3.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kon3_grp, voicegroup128 - .equ se_kon3_pri, 4 - .equ se_kon3_rev, reverb_set+50 - .equ se_kon3_mvl, 127 - .equ se_kon3_key, 0 - .equ se_kon3_tbs, 1 - .equ se_kon3_exg, 0 - .equ se_kon3_cmp, 1 - - .section .rodata - .global se_kon3 - .align 2 - -@********************** Track 1 **********************@ - -se_kon3_1: - .byte KEYSH , se_kon3_key+0 - .byte TEMPO , 150*se_kon3_tbs/2 - .byte VOICE , 16 - .byte VOL , 100*se_kon3_mvl/mxv - .byte BEND , c_v+1 - .byte N12 , Fn4 , v088 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_kon3_2: - .byte KEYSH , se_kon3_key+0 - .byte VOICE , 17 - .byte VOL , 100*se_kon3_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , Fn4 , v072 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_kon3: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kon3_pri @ Priority - .byte se_kon3_rev @ Reverb. - - .word se_kon3_grp - - .word se_kon3_1 - .word se_kon3_2 - - .end