From 6b6e1882e4ceacd3b99eaefd19bbf5f96312f6c1 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:02:01 -0500
Subject: [PATCH] Match se_rg_bag1.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_rg_bag1.mid | Bin 0 -> 115 bytes
 sound/songs/se_rg_bag1.s        |  60 --------------------------------
 4 files changed, 4 insertions(+), 61 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_bag1.mid
 delete mode 100644 sound/songs/se_rg_bag1.s

diff --git a/ld_script.txt b/ld_script.txt
index d5c4eafab..45a2c2368 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -867,7 +867,7 @@ SECTIONS {
         sound/songs/se_rg_card1.o(.rodata);
         sound/songs/se_rg_card2.o(.rodata);
         sound/songs/se_rg_card3.o(.rodata);
-        sound/songs/se_rg_bag1.o(.rodata);
+        sound/songs/midi/se_rg_bag1.o(.rodata);
         sound/songs/se_rg_bag2.o(.rodata);
         sound/songs/se_rg_getting.o(.rodata);
         sound/songs/se_rg_shop.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 1e626a8fc..409d191a5 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1008,5 +1008,8 @@ $(MID_SUBDIR)/se_reapoke.s: %.s: %.mid
 $(MID_SUBDIR)/se_regi.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
 
+$(MID_SUBDIR)/se_rg_bag1.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_bag1.mid b/sound/songs/midi/se_rg_bag1.mid
new file mode 100644
index 0000000000000000000000000000000000000000..ac783bd382467e3b8c7531cce86fc5f4325c355c
GIT binary patch
literal 115
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPy6;{10Si`ohETU!MUgrOa@Ei(!Kt
z2ZJmJgB&M_WUps<z~IC%!PA4W!IOalp;VmVU=72>P!Gn&PzHvH;TepL;SB6RX#gd}
B7}Wp(

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_bag1.s b/sound/songs/se_rg_bag1.s
deleted file mode 100644
index d2dd38ed5..000000000
--- a/sound/songs/se_rg_bag1.s
+++ /dev/null
@@ -1,60 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_bag1_grp, voicegroup129
-	.equ	se_rg_bag1_pri, 5
-	.equ	se_rg_bag1_rev, reverb_set+50
-	.equ	se_rg_bag1_mvl, 127
-	.equ	se_rg_bag1_key, 0
-	.equ	se_rg_bag1_tbs, 1
-	.equ	se_rg_bag1_exg, 0
-	.equ	se_rg_bag1_cmp, 1
-
-	.section .rodata
-	.global	se_rg_bag1
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_bag1_1:
-	.byte	KEYSH , se_rg_bag1_key+0
-	.byte	TEMPO , 310*se_rg_bag1_tbs/2
-	.byte		VOICE , 10
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 127*se_rg_bag1_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte		N01   , Cs4 , v072
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_bag1_2:
-	.byte		VOL   , 127*se_rg_bag1_mvl/mxv
-	.byte	KEYSH , se_rg_bag1_key+0
-	.byte		VOICE , 124
-	.byte		N01   , Cs5 , v072
-	.byte	W01
-	.byte		        Ds5 , v104
-	.byte	W02
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_bag1:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_bag1_pri	@ Priority
-	.byte	se_rg_bag1_rev	@ Reverb.
-
-	.word	se_rg_bag1_grp
-
-	.word	se_rg_bag1_1
-	.word	se_rg_bag1_2
-
-	.end