From 6881c256c41f30b8ad4addbeb52a4f7609514d75 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 15:54:18 -0400
Subject: [PATCH] Match se_tamakoro.mid

---
 ld_script.txt                    |   2 +-
 songs.mk                         |   3 ++
 sound/songs/midi/se_tamakoro.mid | Bin 0 -> 73 bytes
 sound/songs/se_tamakoro.s        |  46 -------------------------------
 4 files changed, 4 insertions(+), 47 deletions(-)
 create mode 100644 sound/songs/midi/se_tamakoro.mid
 delete mode 100644 sound/songs/se_tamakoro.s

diff --git a/ld_script.txt b/ld_script.txt
index cfe0fba54..360fa0ad6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -726,7 +726,7 @@ SECTIONS {
         sound/songs/midi/se_elebeta.o(.rodata);
         sound/songs/midi/se_hinsi.o(.rodata);
         sound/songs/midi/se_expmax.o(.rodata);
-        sound/songs/se_tamakoro.o(.rodata);
+        sound/songs/midi/se_tamakoro.o(.rodata);
         sound/songs/se_tamakoro_e.o(.rodata);
         sound/songs/midi/se_basabasa.o(.rodata);
         sound/songs/midi/se_regi.o(.rodata);
diff --git a/songs.mk b/songs.mk
index d51ef446a..f5d056aa9 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1107,5 +1107,8 @@ $(MID_SUBDIR)/se_tama.s: %.s: %.mid
 $(MID_SUBDIR)/se_tamago.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5
 
+$(MID_SUBDIR)/se_tamakoro.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P2
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_tamakoro.mid b/sound/songs/midi/se_tamakoro.mid
new file mode 100644
index 0000000000000000000000000000000000000000..c6dce2865f08c621a4ad37e84b066b87943f55bb
GIT binary patch
literal 73
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztH|FiCJQ{10SilWJi2ug?ILl3+Ms&#-~L
Up5Xz51H%Nn`sRcNI|h(E02YN1$p8QV

literal 0
HcmV?d00001

diff --git a/sound/songs/se_tamakoro.s b/sound/songs/se_tamakoro.s
deleted file mode 100644
index e71f5964c..000000000
--- a/sound/songs/se_tamakoro.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_tamakoro_grp, voicegroup128
-	.equ	se_tamakoro_pri, 2
-	.equ	se_tamakoro_rev, reverb_set+50
-	.equ	se_tamakoro_mvl, 127
-	.equ	se_tamakoro_key, 0
-	.equ	se_tamakoro_tbs, 1
-	.equ	se_tamakoro_exg, 0
-	.equ	se_tamakoro_cmp, 1
-
-	.section .rodata
-	.global	se_tamakoro
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_tamakoro_1:
-	.byte	KEYSH , se_tamakoro_key+0
-	.byte	TEMPO , 150*se_tamakoro_tbs/2
-	.byte		VOICE , 63
-	.byte		VOL   , 110*se_tamakoro_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		TIE   , Dn3 , v127
-	.byte	W96
-	.byte	W96
-	.byte	W96
-	.byte	W96
-	.byte	W96
-	.byte		EOT   
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_tamakoro:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_tamakoro_pri	@ Priority
-	.byte	se_tamakoro_rev	@ Reverb.
-
-	.word	se_tamakoro_grp
-
-	.word	se_tamakoro_1
-
-	.end