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

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 +++
 sound/songs/midi/se_rg_shop.mid | Bin 0 -> 75 bytes
 sound/songs/se_rg_shop.s        |  46 --------------------------------
 4 files changed, 4 insertions(+), 47 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_shop.mid
 delete mode 100644 sound/songs/se_rg_shop.s

diff --git a/ld_script.txt b/ld_script.txt
index 46cb47800..a12e90a7b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -870,7 +870,7 @@ SECTIONS {
         sound/songs/midi/se_rg_bag1.o(.rodata);
         sound/songs/midi/se_rg_bag2.o(.rodata);
         sound/songs/midi/se_rg_getting.o(.rodata);
-        sound/songs/se_rg_shop.o(.rodata);
+        sound/songs/midi/se_rg_shop.o(.rodata);
         sound/songs/midi/se_rg_kiteki.o(.rodata);
         sound/songs/midi/se_rg_help_op.o(.rodata);
         sound/songs/midi/se_rg_help_cl.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 4fed6d158..e104c6730 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1047,5 +1047,8 @@ $(MID_SUBDIR)/se_rg_kiteki.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_nawamiss.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
 
+$(MID_SUBDIR)/se_rg_shop.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_shop.mid b/sound/songs/midi/se_rg_shop.mid
new file mode 100644
index 0000000000000000000000000000000000000000..81ade1a6362ae7c76b6d3ae95326c6ff06423c1d
GIT binary patch
literal 75
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPf_+{10SiPm*K!ug?ILl43Z(!LWh7
Wo`K7O;Q@mK!vvcOxds~skO}}Gau4(X

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_shop.s b/sound/songs/se_rg_shop.s
deleted file mode 100644
index d184e1e5d..000000000
--- a/sound/songs/se_rg_shop.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_shop_grp, voicegroup129
-	.equ	se_rg_shop_pri, 5
-	.equ	se_rg_shop_rev, reverb_set+50
-	.equ	se_rg_shop_mvl, 127
-	.equ	se_rg_shop_key, 0
-	.equ	se_rg_shop_tbs, 1
-	.equ	se_rg_shop_exg, 0
-	.equ	se_rg_shop_cmp, 1
-
-	.section .rodata
-	.global	se_rg_shop
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_shop_1:
-	.byte	KEYSH , se_rg_shop_key+0
-	.byte	TEMPO , 124*se_rg_shop_tbs/2
-	.byte		VOICE , 8
-	.byte		VOL   , 80*se_rg_shop_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N30   , Cn3 , v120
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_shop:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_shop_pri	@ Priority
-	.byte	se_rg_shop_rev	@ Reverb.
-
-	.word	se_rg_shop_grp
-
-	.word	se_rg_shop_1
-
-	.end