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

---
 ld_script.txt                    |   2 +-
 songs.mk                         |   7 ++-
 sound/songs/midi/se_naminori.mid | Bin 0 -> 149 bytes
 sound/songs/se_naminori.s        |  94 -------------------------------
 4 files changed, 6 insertions(+), 97 deletions(-)
 create mode 100644 sound/songs/midi/se_naminori.mid
 delete mode 100644 sound/songs/se_naminori.s

diff --git a/ld_script.txt b/ld_script.txt
index 7818c5ca6..63260bd81 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -634,7 +634,7 @@ SECTIONS {
         sound/songs/se_poke_dead.o(.rodata);
         sound/songs/se_nigeru.o(.rodata);
         sound/songs/midi/se_jido_doa.o(.rodata);
-        sound/songs/se_naminori.o(.rodata);
+        sound/songs/midi/se_naminori.o(.rodata);
         sound/songs/midi/se_ban.o(.rodata);
         sound/songs/se_pin.o(.rodata);
         sound/songs/midi/se_boo.o(.rodata);
diff --git a/songs.mk b/songs.mk
index b2d711bbd..1d1e3244a 100644
--- a/songs.mk
+++ b/songs.mk
@@ -952,10 +952,10 @@ $(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
 
 $(MID_SUBDIR)/se_mizu.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V20 -P4
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V020 -P4
 
 $(MID_SUBDIR)/se_moter.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V90 -P4
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
 
 $(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
@@ -966,5 +966,8 @@ $(MID_SUBDIR)/se_n.s: %.s: %.mid
 $(MID_SUBDIR)/se_nageru.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5
 
+$(MID_SUBDIR)/se_naminori.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V075 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_naminori.mid b/sound/songs/midi/se_naminori.mid
new file mode 100644
index 0000000000000000000000000000000000000000..ba2aa4931661f44671dd4a308f15d1d1fef8bc14
GIT binary patch
literal 149
zcmXZVp$fuK7>40*|NrlNf<+j}X%@?pHj6MUGLQvvqQN4ZpxD;LaCQm16feO$n-h!=
zZ+NTv763RT5csNY9)mLUXG_G7(C^jq6Z!@IDd6+Mn-N_RwJm_IjKyHbXUax-H-?l~
n<;C%+JSca@t#G4UD_6#)Fjvl%Gou$~%87DpbV8Z7C4R3jYBL!d

literal 0
HcmV?d00001

diff --git a/sound/songs/se_naminori.s b/sound/songs/se_naminori.s
deleted file mode 100644
index 7d3c3a637..000000000
--- a/sound/songs/se_naminori.s
+++ /dev/null
@@ -1,94 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_naminori_grp, voicegroup127
-	.equ	se_naminori_pri, 4
-	.equ	se_naminori_rev, reverb_set+50
-	.equ	se_naminori_mvl, 127
-	.equ	se_naminori_key, 0
-	.equ	se_naminori_tbs, 1
-	.equ	se_naminori_exg, 0
-	.equ	se_naminori_cmp, 1
-
-	.section .rodata
-	.global	se_naminori
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_naminori_1:
-	.byte	KEYSH , se_naminori_key+0
-	.byte	TEMPO , 220*se_naminori_tbs/2
-	.byte		VOICE , 123
-	.byte		VOL   , 75*se_naminori_mvl/mxv
-	.byte		N03   , Ds3 , v127
-	.byte	W03
-	.byte		TIE   , Cn4 
-	.byte	W21
-	.byte	W24
-	.byte	W18
-	.byte		VOL   , 75*se_naminori_mvl/mxv
-	.byte	W06
-	.byte		        71*se_naminori_mvl/mxv
-	.byte	W05
-	.byte		        67*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        62*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        59*se_naminori_mvl/mxv
-	.byte	W05
-	.byte		        57*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        54*se_naminori_mvl/mxv
-	.byte	W04
-	.byte	W02
-	.byte		        50*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        49*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        44*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        41*se_naminori_mvl/mxv
-	.byte	W02
-	.byte		        38*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        35*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        32*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        28*se_naminori_mvl/mxv
-	.byte	W02
-	.byte		        24*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        21*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        18*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        14*se_naminori_mvl/mxv
-	.byte	W02
-	.byte		        11*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        9*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        6*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        3*se_naminori_mvl/mxv
-	.byte	W02
-	.byte		        1*se_naminori_mvl/mxv
-	.byte	W22
-	.byte		EOT   
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_naminori:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_naminori_pri	@ Priority
-	.byte	se_naminori_rev	@ Reverb.
-
-	.word	se_naminori_grp
-
-	.word	se_naminori_1
-
-	.end