From 3eff7efd8f0e5dc27ddf8c7c90a8fa1b287a933d Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:23:09 -0500
Subject: [PATCH] Match se_rg_getting.mid

---
 ld_script.txt                      |   2 +-
 songs.mk                           |   3 ++
 sound/song_table.inc               |   2 +-
 sound/songs/midi/se_rg_getting.mid | Bin 0 -> 119 bytes
 sound/songs/se_rg_getting.s        |  69 -----------------------------
 5 files changed, 5 insertions(+), 71 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_getting.mid
 delete mode 100644 sound/songs/se_rg_getting.s

diff --git a/ld_script.txt b/ld_script.txt
index af50e003e..b7516fc1e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -869,7 +869,7 @@ SECTIONS {
         sound/songs/midi/se_rg_card3.o(.rodata);
         sound/songs/midi/se_rg_bag1.o(.rodata);
         sound/songs/midi/se_rg_bag2.o(.rodata);
-        sound/songs/se_rg_getting.o(.rodata);
+        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);
diff --git a/songs.mk b/songs.mk
index 3a85d7e51..7cef3a33c 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1029,5 +1029,8 @@ $(MID_SUBDIR)/se_rg_deomov.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_excellent.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5
 
+$(MID_SUBDIR)/se_rg_getting.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 9b4564e22..8a6a675c9 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -255,7 +255,7 @@ gSongTable:: @ 86B49F0
 	song se_rg_card3, 1, 1          @ Trainer Card 3 (FRLG)
 	song se_rg_bag1, 1, 1           @ Bag Scroll (FRLG)
 	song se_rg_bag2, 1, 1           @ Bag Pocket Change (FRLG)
-	song se_rg_getting, 1, 1        
+	song se_rg_getting, 1, 1
 	song se_rg_shop, 1, 1           @ Cash Register (FRLG)
 	song se_rg_kiteki, 1, 1         @ S.S. Anne Horn (FRLG)
 	song se_rg_help_op, 1, 1        @ Help Menu Open (FRLG)
diff --git a/sound/songs/midi/se_rg_getting.mid b/sound/songs/midi/se_rg_getting.mid
new file mode 100644
index 0000000000000000000000000000000000000000..f8bf4b38fd602d2d96ef4859264c9afd6a517625
GIT binary patch
literal 119
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPy6;{10Si`ohETU!MUgrOj}FnPGz*
z2ZJmJgB&M_WUps<z~I0z!M%d1!JUC^f=@kDgAW5YLW?lN!8(SG?DZ@Y4JsHL4HyJ~
FQUI4o8ZrO?

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_getting.s b/sound/songs/se_rg_getting.s
deleted file mode 100644
index 2c632f399..000000000
--- a/sound/songs/se_rg_getting.s
+++ /dev/null
@@ -1,69 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_getting_grp, voicegroup129
-	.equ	se_rg_getting_pri, 5
-	.equ	se_rg_getting_rev, reverb_set+50
-	.equ	se_rg_getting_mvl, 127
-	.equ	se_rg_getting_key, 0
-	.equ	se_rg_getting_tbs, 1
-	.equ	se_rg_getting_exg, 0
-	.equ	se_rg_getting_cmp, 1
-
-	.section .rodata
-	.global	se_rg_getting
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_getting_1:
-	.byte	KEYSH , se_rg_getting_key+0
-	.byte	TEMPO , 310*se_rg_getting_tbs/2
-	.byte		VOICE , 3
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 100*se_rg_getting_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N02   , Bn3 , v120
-	.byte	W03
-	.byte	W03
-	.byte	W02
-	.byte		        En4 , v127
-	.byte	W01
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_getting_2:
-	.byte	KEYSH , se_rg_getting_key+0
-	.byte		VOICE , 126
-	.byte		VOL   , 100*se_rg_getting_mvl/mxv
-	.byte	W03
-	.byte	W01
-	.byte		N01   , Cn2 , v120
-	.byte	W02
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_getting:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_getting_pri	@ Priority
-	.byte	se_rg_getting_rev	@ Reverb.
-
-	.word	se_rg_getting_grp
-
-	.word	se_rg_getting_1
-	.word	se_rg_getting_2
-
-	.end