From a00079e63b31815dc86cc31120f5c0b19dcd2f66 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:55:18 -0500
Subject: [PATCH] Match se_suikomu.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_suikomu.mid | Bin 0 -> 156 bytes
 sound/songs/se_suikomu.s        |  78 --------------------------------
 4 files changed, 4 insertions(+), 79 deletions(-)
 create mode 100644 sound/songs/midi/se_suikomu.mid
 delete mode 100644 sound/songs/se_suikomu.s

diff --git a/ld_script.txt b/ld_script.txt
index 401c9c784..e79826fab 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -675,7 +675,7 @@ SECTIONS {
         sound/songs/midi/se_kon2.o(.rodata);
         sound/songs/midi/se_kon3.o(.rodata);
         sound/songs/midi/se_kon4.o(.rodata);
-        sound/songs/se_suikomu.o(.rodata);
+        sound/songs/midi/se_suikomu.o(.rodata);
         sound/songs/midi/se_nageru.o(.rodata);
         sound/songs/se_toy_c.o(.rodata);
         sound/songs/se_toy_d.o(.rodata);
diff --git a/songs.mk b/songs.mk
index ddf2b478b..126477b99 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1074,5 +1074,8 @@ $(MID_SUBDIR)/se_seikai.s: %.s: %.mid
 $(MID_SUBDIR)/se_select.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5
 
+$(MID_SUBDIR)/se_suikomu.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_suikomu.mid b/sound/songs/midi/se_suikomu.mid
new file mode 100644
index 0000000000000000000000000000000000000000..871c8e5d3e39392a5cd6009162ae7b47c8586ed3
GIT binary patch
literal 156
zcmeYb$w*;fU|?flWMF2H@C_--2J(0q{ztGdvPy6;{MToIin%fz;APk#!o$EW!0>>f
zkYR#<0OJOB3m`iTNGAa45Fnioq!WR3J&-PAWT<Cs@MmD2;IF|9q>&6$WjI*Pu#w%H
eVPb#@<3{!vM)qPx_Il>V00!oX0TLh@q!<8$q$FVg

literal 0
HcmV?d00001

diff --git a/sound/songs/se_suikomu.s b/sound/songs/se_suikomu.s
deleted file mode 100644
index eff89df3a..000000000
--- a/sound/songs/se_suikomu.s
+++ /dev/null
@@ -1,78 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_suikomu_grp, voicegroup127
-	.equ	se_suikomu_pri, 5
-	.equ	se_suikomu_rev, reverb_set+50
-	.equ	se_suikomu_mvl, 127
-	.equ	se_suikomu_key, 0
-	.equ	se_suikomu_tbs, 1
-	.equ	se_suikomu_exg, 0
-	.equ	se_suikomu_cmp, 1
-
-	.section .rodata
-	.global	se_suikomu
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_suikomu_1:
-	.byte	KEYSH , se_suikomu_key+0
-	.byte		VOICE , 13
-	.byte		BENDR , 12
-	.byte		VOL   , 12*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+49
-	.byte		N06   , Gn4 , v080
-	.byte	W01
-	.byte		VOL   , 44*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+22
-	.byte	W01
-	.byte		VOL   , 75*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+20
-	.byte	W01
-	.byte		VOL   , 87*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+33
-	.byte	W01
-	.byte		VOL   , 100*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+54
-	.byte	W01
-	.byte		        c_v+63
-	.byte	W01
-	.byte	W03
-	.byte		N03   , Gn4 , v040
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_suikomu_2:
-	.byte	KEYSH , se_suikomu_key+0
-	.byte		VOICE , 123
-	.byte		VOL   , 59*se_suikomu_mvl/mxv
-	.byte		N06   , Gs4 , v052
-	.byte	W01
-	.byte		VOL   , 72*se_suikomu_mvl/mxv
-	.byte	W01
-	.byte		        90*se_suikomu_mvl/mxv
-	.byte	W01
-	.byte		        100*se_suikomu_mvl/mxv
-	.byte	W03
-	.byte	W03
-	.byte		N03   , Gs4 , v024
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_suikomu:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_suikomu_pri	@ Priority
-	.byte	se_suikomu_rev	@ Reverb.
-
-	.word	se_suikomu_grp
-
-	.word	se_suikomu_1
-	.word	se_suikomu_2
-
-	.end