From 6437f9fb15be521793eb14135207a4f57221a9ac Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 16:34:00 -0400
Subject: [PATCH] Match se_tu_saa.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index ffb7c2226..3d80eed76 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -681,7 +681,7 @@ SECTIONS {
         sound/songs/midi/se_ki_gasyan.o(.rodata);
         sound/songs/midi/se_tk_warpin.o(.rodata);
         sound/songs/midi/se_tk_warpout.o(.rodata);
-        sound/songs/se_tu_saa.o(.rodata);
+        sound/songs/midi/se_tu_saa.o(.rodata);
         sound/songs/midi/se_hi_turun.o(.rodata);
         sound/songs/midi/se_track_move.o(.rodata);
         sound/songs/midi/se_track_stop.o(.rodata);
diff --git a/songs.mk b/songs.mk
index f2a6f44e2..aaacea72b 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1179,5 +1179,8 @@ $(MID_SUBDIR)/se_track_move.s: %.s: %.mid
 $(MID_SUBDIR)/se_track_stop.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4
 
+$(MID_SUBDIR)/se_tu_saa.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_tu_saa.mid b/sound/songs/midi/se_tu_saa.mid
new file mode 100644
index 0000000000000000000000000000000000000000..c84b176cb94e636ff752f963a4d8e3547277b5c1
GIT binary patch
literal 96
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPf_+{10Si(F|w!ug?IL(q}kO&9H&J
ro?(KA4ReDB1CSlTFd@K(c>{X_GkY2{dp<LJ1v7iSU_$@{BTyRvwtp1s

literal 0
HcmV?d00001

diff --git a/sound/songs/se_tu_saa.s b/sound/songs/se_tu_saa.s
deleted file mode 100644
index c9346509c..000000000
--- a/sound/songs/se_tu_saa.s
+++ /dev/null
@@ -1,55 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_tu_saa_grp, voicegroup127
-	.equ	se_tu_saa_pri, 4
-	.equ	se_tu_saa_rev, reverb_set+50
-	.equ	se_tu_saa_mvl, 127
-	.equ	se_tu_saa_key, 0
-	.equ	se_tu_saa_tbs, 1
-	.equ	se_tu_saa_exg, 0
-	.equ	se_tu_saa_cmp, 1
-
-	.section .rodata
-	.global	se_tu_saa
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_tu_saa_1:
-	.byte	KEYSH , se_tu_saa_key+0
-	.byte	TEMPO , 220*se_tu_saa_tbs/2
-	.byte		VOICE , 123
-	.byte		VOL   , 90*se_tu_saa_mvl/mxv
-	.byte		N03   , Cn4 , v060
-	.byte	W03
-	.byte		VOL   , 62*se_tu_saa_mvl/mxv
-	.byte		N32   , Gs4 
-	.byte	W03
-	.byte		VOL   , 68*se_tu_saa_mvl/mxv
-	.byte	W03
-	.byte		        72*se_tu_saa_mvl/mxv
-	.byte	W03
-	.byte		        78*se_tu_saa_mvl/mxv
-	.byte	W03
-	.byte		        85*se_tu_saa_mvl/mxv
-	.byte	W03
-	.byte		        90*se_tu_saa_mvl/mxv
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_tu_saa:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_tu_saa_pri	@ Priority
-	.byte	se_tu_saa_rev	@ Reverb.
-
-	.word	se_tu_saa_grp
-
-	.word	se_tu_saa_1
-
-	.end