From 1f8954115f5f0c52ee0c42fef3485289c196fd00 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:30:56 -0500
Subject: [PATCH] Match se_rg_help_op.mid

---
 ld_script.txt                      |   2 +-
 songs.mk                           |   3 ++
 sound/songs/midi/se_rg_help_op.mid | Bin 0 -> 233 bytes
 sound/songs/se_rg_help_op.s        |  82 -----------------------------
 4 files changed, 4 insertions(+), 83 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_help_op.mid
 delete mode 100644 sound/songs/se_rg_help_op.s

diff --git a/ld_script.txt b/ld_script.txt
index 27acfeb2e..094b2df61 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -872,7 +872,7 @@ SECTIONS {
         sound/songs/midi/se_rg_getting.o(.rodata);
         sound/songs/se_rg_shop.o(.rodata);
         sound/songs/se_rg_kiteki.o(.rodata);
-        sound/songs/se_rg_help_op.o(.rodata);
+        sound/songs/midi/se_rg_help_op.o(.rodata);
         sound/songs/midi/se_rg_help_cl.o(.rodata);
         sound/songs/midi/se_rg_help_ng.o(.rodata);
         sound/songs/midi/se_rg_deomov.o(.rodata);
diff --git a/songs.mk b/songs.mk
index b66808c49..d2d402a99 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1038,5 +1038,8 @@ $(MID_SUBDIR)/se_rg_help_cl.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_help_ng.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V125 -P5
 
+$(MID_SUBDIR)/se_rg_help_op.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -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_op.mid b/sound/songs/midi/se_rg_help_op.mid
new file mode 100644
index 0000000000000000000000000000000000000000..79b6c53a8345f14ada604acff6ca3d8388c35a0b
GIT binary patch
literal 233
zcmYk$F$%&k0EOY#7_=6Vf(jXXfTEtG*g~KQjvX8Xw_cz<LXOhW(VNBBkRjWjFOQJ6
zf4=~1kwHMU{rKVO1pkzoP&vHbi0dByhIsYGPhq*#I3KW^P?T`ZAm;{RDZs8`S8yG@
vTYX~FL(?@~$GxV9zQY;1iF-p2J;2$AoNe4&dT73BRpMphdE#>IBme&g%KtQD

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_help_op.s b/sound/songs/se_rg_help_op.s
deleted file mode 100644
index 8bffb7938..000000000
--- a/sound/songs/se_rg_help_op.s
+++ /dev/null
@@ -1,82 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_help_op_grp, voicegroup129
-	.equ	se_rg_help_op_pri, 5
-	.equ	se_rg_help_op_rev, reverb_set+50
-	.equ	se_rg_help_op_mvl, 127
-	.equ	se_rg_help_op_key, 0
-	.equ	se_rg_help_op_tbs, 1
-	.equ	se_rg_help_op_exg, 0
-	.equ	se_rg_help_op_cmp, 1
-
-	.section .rodata
-	.global	se_rg_help_op
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_help_op_1:
-	.byte	KEYSH , se_rg_help_op_key+0
-	.byte	TEMPO , 420*se_rg_help_op_tbs/2
-	.byte		VOICE , 24
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		VOL   , 96*se_rg_help_op_mvl/mxv
-	.byte		PAN   , c_v-48
-	.byte		N04   , Dn4 , v096
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-32
-	.byte		N04   , Fs4 , v096
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Fs4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-32
-	.byte		N04   , An4 , v096
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , An4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-16
-	.byte		N04   , Cs5 , v096
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Cs5 , v032
-	.byte	W06
-	.byte		PAN   , c_v+32
-	.byte		N04   , Dn5 , v076
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn5 , v032
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Dn5 , v024
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn5 , v016
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Dn5 , v008
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn5 , v004
-	.byte	W18
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_help_op:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_help_op_pri	@ Priority
-	.byte	se_rg_help_op_rev	@ Reverb.
-
-	.word	se_rg_help_op_grp
-
-	.word	se_rg_help_op_1
-
-	.end