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

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

diff --git a/ld_script.txt b/ld_script.txt
index d61fd8bce..f13e04072 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -661,7 +661,7 @@ SECTIONS {
         sound/songs/midi/se_basabasa.o(.rodata);
         sound/songs/se_regi.o(.rodata);
         sound/songs/midi/se_c_gaji.o(.rodata);
-        sound/songs/se_c_maku_u.o(.rodata);
+        sound/songs/midi/se_c_maku_u.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);
diff --git a/songs.mk b/songs.mk
index a058364cd..9afe371b2 100644
--- a/songs.mk
+++ b/songs.mk
@@ -816,5 +816,8 @@ $(MID_SUBDIR)/se_c_gaji.s: %.s: %.mid
 $(MID_SUBDIR)/se_c_maku_d.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5
 
+$(MID_SUBDIR)/se_c_maku_u.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_u.mid b/sound/songs/midi/se_c_maku_u.mid
new file mode 100644
index 0000000000000000000000000000000000000000..109f92322067c6ab88f30d55623a492f588aefad
GIT binary patch
literal 195
zcmYk#F$%&^5CqWKpOCe)5F~nnbb5dk20;+~kiak0Dn$^9r11iYH_)3TH_)5tN#ZCL
zR&REfVXZqB00Ia+gw~x;oJQ!kzWCt)edYzz2K@}b(;W8+S{>tw1+Hl<twy4;s1q%X
z)<!E)D;k+5#b0la#}FNRFZOOpA)Q9dOB&M^b#zTjx-p&BG!r<kD#jhPG^d~H!CaE>
Fhc~knEWH2#

literal 0
HcmV?d00001

diff --git a/sound/songs/se_c_maku_u.s b/sound/songs/se_c_maku_u.s
deleted file mode 100644
index fa0ef3f0d..000000000
--- a/sound/songs/se_c_maku_u.s
+++ /dev/null
@@ -1,95 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_c_maku_u_grp, voicegroup128
-	.equ	se_c_maku_u_pri, 5
-	.equ	se_c_maku_u_rev, reverb_set+50
-	.equ	se_c_maku_u_mvl, 127
-	.equ	se_c_maku_u_key, 0
-	.equ	se_c_maku_u_tbs, 1
-	.equ	se_c_maku_u_exg, 0
-	.equ	se_c_maku_u_cmp, 1
-
-	.section .rodata
-	.global	se_c_maku_u
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_c_maku_u_1:
-	.byte	KEYSH , se_c_maku_u_key+0
-	.byte	TEMPO , 150*se_c_maku_u_tbs/2
-	.byte		VOICE , 25
-	.byte		VOL   , 12*se_c_maku_u_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N12   , Gs4 , v060
-	.byte	W01
-	.byte		VOL   , 22*se_c_maku_u_mvl/mxv
-	.byte	W01
-	.byte		        33*se_c_maku_u_mvl/mxv
-	.byte	W01
-	.byte		        46*se_c_maku_u_mvl/mxv
-	.byte	W01
-	.byte		        58*se_c_maku_u_mvl/mxv
-	.byte	W02
-	.byte		        70*se_c_maku_u_mvl/mxv
-	.byte	W02
-	.byte		        60*se_c_maku_u_mvl/mxv
-	.byte	W01
-	.byte		        42*se_c_maku_u_mvl/mxv
-	.byte	W01
-	.byte		        22*se_c_maku_u_mvl/mxv
-	.byte	W02
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_c_maku_u_2:
-	.byte	KEYSH , se_c_maku_u_key+0
-	.byte		VOICE , 15
-	.byte		VOL   , 12*se_c_maku_u_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N12   , Fn3 , v100
-	.byte	W01
-	.byte		VOL   , 22*se_c_maku_u_mvl/mxv
-	.byte		BEND  , c_v+3
-	.byte	W01
-	.byte		VOL   , 33*se_c_maku_u_mvl/mxv
-	.byte		BEND  , c_v+6
-	.byte	W01
-	.byte		VOL   , 46*se_c_maku_u_mvl/mxv
-	.byte		BEND  , c_v+9
-	.byte	W01
-	.byte		VOL   , 58*se_c_maku_u_mvl/mxv
-	.byte		BEND  , c_v+12
-	.byte	W02
-	.byte		VOL   , 70*se_c_maku_u_mvl/mxv
-	.byte		BEND  , c_v+17
-	.byte	W01
-	.byte		        c_v+20
-	.byte	W01
-	.byte		VOL   , 60*se_c_maku_u_mvl/mxv
-	.byte		BEND  , c_v+25
-	.byte	W01
-	.byte		VOL   , 42*se_c_maku_u_mvl/mxv
-	.byte		BEND  , c_v+32
-	.byte	W01
-	.byte		VOL   , 22*se_c_maku_u_mvl/mxv
-	.byte		BEND  , c_v+38
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_c_maku_u:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_c_maku_u_pri	@ Priority
-	.byte	se_c_maku_u_rev	@ Reverb.
-
-	.word	se_c_maku_u_grp
-
-	.word	se_c_maku_u_1
-	.word	se_c_maku_u_2
-
-	.end