From 76cb44666164d9b5159d7f700502e09415f0dff1 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:29:26 -0500
Subject: [PATCH] Match se_rg_help_ng.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 05d0508f63..27acfeb2ee 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -874,7 +874,7 @@ SECTIONS {
         sound/songs/se_rg_kiteki.o(.rodata);
         sound/songs/se_rg_help_op.o(.rodata);
         sound/songs/midi/se_rg_help_cl.o(.rodata);
-        sound/songs/se_rg_help_ng.o(.rodata);
+        sound/songs/midi/se_rg_help_ng.o(.rodata);
         sound/songs/midi/se_rg_deomov.o(.rodata);
         sound/songs/midi/se_rg_excellent.o(.rodata);
         sound/songs/se_rg_nawamiss.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 01fc89933d..b66808c49c 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1035,5 +1035,8 @@ $(MID_SUBDIR)/se_rg_getting.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_help_cl.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V095 -P5
 
+$(MID_SUBDIR)/se_rg_help_ng.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V125 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_help_cl.mid b/sound/songs/midi/se_rg_help_cl.mid
index c2c2612525dced02ff1ea17c99e8f42101353f64..09b151631c15905889067c9f53871f1028c24f6a 100644
GIT binary patch
delta 11
ScmaFK_>ysg6eHtA>2m-Xodf#-

delta 11
ScmaFK_>ysg6eG(->2m-XsRRB1

diff --git a/sound/songs/midi/se_rg_help_ng.mid b/sound/songs/midi/se_rg_help_ng.mid
new file mode 100644
index 0000000000000000000000000000000000000000..f9597632aac87c6267e2564bcc853113a83032f6
GIT binary patch
literal 155
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10Si(&J?Kug?IL%3?Sm!LUJ8
zhe3pgfy;q`J&9q0R|QLh7X#A<E(Rc50m`;#nBbSd(%=UYuLrV$;z0I+7={fXT|g1t
e0+t3{2DS~19842*BiMj!pqK=h-oVHJvJn7`QXv8W

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_help_ng.s b/sound/songs/se_rg_help_ng.s
deleted file mode 100644
index f430c245ab..0000000000
--- a/sound/songs/se_rg_help_ng.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_help_ng_grp, voicegroup129
-	.equ	se_rg_help_ng_pri, 5
-	.equ	se_rg_help_ng_rev, reverb_set+50
-	.equ	se_rg_help_ng_mvl, 127
-	.equ	se_rg_help_ng_key, 0
-	.equ	se_rg_help_ng_tbs, 1
-	.equ	se_rg_help_ng_exg, 0
-	.equ	se_rg_help_ng_cmp, 1
-
-	.section .rodata
-	.global	se_rg_help_ng
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_help_ng_1:
-	.byte	KEYSH , se_rg_help_ng_key+0
-	.byte	TEMPO , 420*se_rg_help_ng_tbs/2
-	.byte		VOICE , 24
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 96*se_rg_help_ng_mvl/mxv
-	.byte		N04   , Dn4 , v120
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-1
-	.byte		N04   , Fs4 , v096
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Fs4 , v032
-	.byte	W06
-	.byte		VOICE , 92
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 125*se_rg_help_ng_mvl/mxv
-	.byte		N04   , An1 , v112
-	.byte	W10
-	.byte		MOD   , 8
-	.byte	W02
-	.byte		N06   , An1 , v088
-	.byte	W06
-	.byte		        An1 , v024
-	.byte	W06
-	.byte		MOD   , 0
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_help_ng:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_help_ng_pri	@ Priority
-	.byte	se_rg_help_ng_rev	@ Reverb.
-
-	.word	se_rg_help_ng_grp
-
-	.word	se_rg_help_ng_1
-
-	.end