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

---
 ld_script.txt                  |   2 +-
 songs.mk                       |   3 ++
 sound/songs/midi/se_nigeru.mid | Bin 0 -> 164 bytes
 sound/songs/se_nigeru.s        |  64 ---------------------------------
 4 files changed, 4 insertions(+), 65 deletions(-)
 create mode 100644 sound/songs/midi/se_nigeru.mid
 delete mode 100644 sound/songs/se_nigeru.s

diff --git a/ld_script.txt b/ld_script.txt
index 63260bd81..68fcaf28b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -632,7 +632,7 @@ SECTIONS {
         sound/songs/midi/se_kouka_h.o(.rodata);
         sound/songs/midi/se_bowa2.o(.rodata);
         sound/songs/se_poke_dead.o(.rodata);
-        sound/songs/se_nigeru.o(.rodata);
+        sound/songs/midi/se_nigeru.o(.rodata);
         sound/songs/midi/se_jido_doa.o(.rodata);
         sound/songs/midi/se_naminori.o(.rodata);
         sound/songs/midi/se_ban.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 1d1e3244a..04763ca07 100644
--- a/songs.mk
+++ b/songs.mk
@@ -969,5 +969,8 @@ $(MID_SUBDIR)/se_nageru.s: %.s: %.mid
 $(MID_SUBDIR)/se_naminori.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V075 -P4
 
+$(MID_SUBDIR)/se_nigeru.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_nigeru.mid b/sound/songs/midi/se_nigeru.mid
new file mode 100644
index 0000000000000000000000000000000000000000..faf37d5294932f0269de38b209a05fbe7f2745e4
GIT binary patch
literal 164
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SilWJi2ug?ILDrPuP$FPCD
zo?(J-1#^Qh1H*)X0_KJQAnjDZ)ZoOxI3d6T%1?muEuj1WC|?80cYyLGpnL-;Uj)jR
KVFsE9vKj#X0462?

literal 0
HcmV?d00001

diff --git a/sound/songs/se_nigeru.s b/sound/songs/se_nigeru.s
deleted file mode 100644
index babc7868d..000000000
--- a/sound/songs/se_nigeru.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_nigeru_grp, voicegroup127
-	.equ	se_nigeru_pri, 5
-	.equ	se_nigeru_rev, reverb_set+50
-	.equ	se_nigeru_mvl, 127
-	.equ	se_nigeru_key, 0
-	.equ	se_nigeru_tbs, 1
-	.equ	se_nigeru_exg, 0
-	.equ	se_nigeru_cmp, 1
-
-	.section .rodata
-	.global	se_nigeru
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_nigeru_1:
-	.byte	KEYSH , se_nigeru_key+0
-	.byte	TEMPO , 150*se_nigeru_tbs/2
-	.byte		VOICE , 126
-	.byte		VOL   , 90*se_nigeru_mvl/mxv
-	.byte		N03   , Fn4 , v120
-	.byte	W03
-	.byte		        Gs4 , v112
-	.byte	W03
-	.byte		N02   , Fs3 
-	.byte	W03
-	.byte		N03   , Gs4 , v072
-	.byte	W03
-	.byte		N02   , Fs3 , v096
-	.byte	W03
-	.byte		N03   , Gs4 , v056
-	.byte	W03
-	.byte		N02   , Fs3 , v080
-	.byte	W03
-	.byte		N03   , Gs4 , v040
-	.byte	W03
-	.byte		N02   , Fs3 , v064
-	.byte	W03
-	.byte		N03   , Gs4 , v024
-	.byte	W03
-	.byte		N02   , Fs3 , v048
-	.byte	W03
-	.byte		N03   , Gs4 , v020
-	.byte	W03
-	.byte		        Fs3 , v028
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_nigeru:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_nigeru_pri	@ Priority
-	.byte	se_nigeru_rev	@ Reverb.
-
-	.word	se_nigeru_grp
-
-	.word	se_nigeru_1
-
-	.end