From f967501b735dbdf6a1e5e0beb08ebdb78793b507 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 14:49:10 -0400
Subject: [PATCH] Match se_c_maku_d.mid

---
 ld_script.txt                    |   2 +-
 songs.mk                         |   3 +
 sound/songs/midi/se_c_maku_d.mid | Bin 0 -> 195 bytes
 sound/songs/se_c_maku_d.s        |  95 -------------------------------
 4 files changed, 4 insertions(+), 96 deletions(-)
 create mode 100644 sound/songs/midi/se_c_maku_d.mid
 delete mode 100644 sound/songs/se_c_maku_d.s

diff --git a/ld_script.txt b/ld_script.txt
index 132cf6746..d61fd8bce 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -662,7 +662,7 @@ SECTIONS {
         sound/songs/se_regi.o(.rodata);
         sound/songs/midi/se_c_gaji.o(.rodata);
         sound/songs/se_c_maku_u.o(.rodata);
-        sound/songs/se_c_maku_d.o(.rodata);
+        sound/songs/midi/se_c_maku_d.o(.rodata);
         sound/songs/se_c_pasi.o(.rodata);
         sound/songs/se_c_syu.o(.rodata);
         sound/songs/se_c_pikon.o(.rodata);
diff --git a/songs.mk b/songs.mk
index aff7937d5..a058364cd 100644
--- a/songs.mk
+++ b/songs.mk
@@ -813,5 +813,8 @@ $(MID_SUBDIR)/se_bt_start.s: %.s: %.mid
 $(MID_SUBDIR)/se_c_gaji.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
 
+$(MID_SUBDIR)/se_c_maku_d.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_c_maku_d.mid b/sound/songs/midi/se_c_maku_d.mid
new file mode 100644
index 0000000000000000000000000000000000000000..04e2bfb11a2d3ce1b4b62f02d128992b84bbecd0
GIT binary patch
literal 195
zcmYk#F$%&!5Czabn~>2;L6B%?7b~?9ge}Yg79wmR)+r>C#tS6gKyQ-VKyRWaiC?j>
zdVgm4jPu7FKm<X6*!lB`(+J%@lrZk0+Xd0IMz_H4w8VXaM#p$!i)&`3(L~gWdeOpY
zWwaD^qKT<9{Phla4A8RoV(*sb(rUtNsihn0>6#XFWm>K1TrlIRWSme(hxAkJn@jrr
F@CJ&cD>DE9

literal 0
HcmV?d00001

diff --git a/sound/songs/se_c_maku_d.s b/sound/songs/se_c_maku_d.s
deleted file mode 100644
index f97673f07..000000000
--- a/sound/songs/se_c_maku_d.s
+++ /dev/null
@@ -1,95 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_c_maku_d_grp, voicegroup128
-	.equ	se_c_maku_d_pri, 5
-	.equ	se_c_maku_d_rev, reverb_set+50
-	.equ	se_c_maku_d_mvl, 127
-	.equ	se_c_maku_d_key, 0
-	.equ	se_c_maku_d_tbs, 1
-	.equ	se_c_maku_d_exg, 0
-	.equ	se_c_maku_d_cmp, 1
-
-	.section .rodata
-	.global	se_c_maku_d
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_c_maku_d_1:
-	.byte	KEYSH , se_c_maku_d_key+0
-	.byte	TEMPO , 150*se_c_maku_d_tbs/2
-	.byte		VOICE , 25
-	.byte		VOL   , 12*se_c_maku_d_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N12   , Gs4 , v060
-	.byte	W01
-	.byte		VOL   , 22*se_c_maku_d_mvl/mxv
-	.byte	W01
-	.byte		        33*se_c_maku_d_mvl/mxv
-	.byte	W01
-	.byte		        46*se_c_maku_d_mvl/mxv
-	.byte	W01
-	.byte		        58*se_c_maku_d_mvl/mxv
-	.byte	W02
-	.byte		        70*se_c_maku_d_mvl/mxv
-	.byte	W02
-	.byte		        60*se_c_maku_d_mvl/mxv
-	.byte	W01
-	.byte		        42*se_c_maku_d_mvl/mxv
-	.byte	W01
-	.byte		        22*se_c_maku_d_mvl/mxv
-	.byte	W02
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_c_maku_d_2:
-	.byte	KEYSH , se_c_maku_d_key+0
-	.byte		VOICE , 15
-	.byte		VOL   , 12*se_c_maku_d_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N12   , Fn3 , v100
-	.byte	W01
-	.byte		VOL   , 22*se_c_maku_d_mvl/mxv
-	.byte		BEND  , c_v-4
-	.byte	W01
-	.byte		VOL   , 33*se_c_maku_d_mvl/mxv
-	.byte		BEND  , c_v-7
-	.byte	W01
-	.byte		VOL   , 46*se_c_maku_d_mvl/mxv
-	.byte		BEND  , c_v-10
-	.byte	W01
-	.byte		VOL   , 58*se_c_maku_d_mvl/mxv
-	.byte		BEND  , c_v-15
-	.byte	W02
-	.byte		VOL   , 70*se_c_maku_d_mvl/mxv
-	.byte		BEND  , c_v-23
-	.byte	W01
-	.byte		        c_v-31
-	.byte	W01
-	.byte		VOL   , 60*se_c_maku_d_mvl/mxv
-	.byte		BEND  , c_v-39
-	.byte	W01
-	.byte		VOL   , 42*se_c_maku_d_mvl/mxv
-	.byte		BEND  , c_v-48
-	.byte	W01
-	.byte		VOL   , 22*se_c_maku_d_mvl/mxv
-	.byte		BEND  , c_v-55
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_c_maku_d:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_c_maku_d_pri	@ Priority
-	.byte	se_c_maku_d_rev	@ Reverb.
-
-	.word	se_c_maku_d_grp
-
-	.word	se_c_maku_d_1
-	.word	se_c_maku_d_2
-
-	.end