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

---
 ld_script.txt                    |   2 +-
 songs.mk                         |   3 ++
 sound/songs/midi/se_rg_card2.mid | Bin 0 -> 109 bytes
 sound/songs/se_rg_card2.s        |  62 -------------------------------
 4 files changed, 4 insertions(+), 63 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_card2.mid
 delete mode 100644 sound/songs/se_rg_card2.s

diff --git a/ld_script.txt b/ld_script.txt
index 65899eb9b7..96fd2cc20b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -865,7 +865,7 @@ SECTIONS {
         sound/songs/se_w063b.o(.rodata);
         sound/songs/se_rg_w_door.o(.rodata);
         sound/songs/midi/se_rg_card1.o(.rodata);
-        sound/songs/se_rg_card2.o(.rodata);
+        sound/songs/midi/se_rg_card2.o(.rodata);
         sound/songs/se_rg_card3.o(.rodata);
         sound/songs/midi/se_rg_bag1.o(.rodata);
         sound/songs/midi/se_rg_bag2.o(.rodata);
diff --git a/songs.mk b/songs.mk
index c4efe8c4f0..ab9873e047 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1017,5 +1017,8 @@ $(MID_SUBDIR)/se_rg_bag2.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_card1.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
+$(MID_SUBDIR)/se_rg_card2.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_card2.mid b/sound/songs/midi/se_rg_card2.mid
new file mode 100644
index 0000000000000000000000000000000000000000..02276b2ad0cb428ec38650c76fb9bc31f83d0aa7
GIT binary patch
literal 109
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SiWk1I7U!MUgWy5fwmSKY&
z2ZJmJgB&M_<Z@tO7hrh6;KVQ?I)Zrvy8<)20W-S;GkX9tdjd0i0W*6&b3-&k0?-Tq
DQ+gDJ

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_card2.s b/sound/songs/se_rg_card2.s
deleted file mode 100644
index 7f83de0970..0000000000
--- a/sound/songs/se_rg_card2.s
+++ /dev/null
@@ -1,62 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_card2_grp, voicegroup129
-	.equ	se_rg_card2_pri, 5
-	.equ	se_rg_card2_rev, reverb_set+50
-	.equ	se_rg_card2_mvl, 127
-	.equ	se_rg_card2_key, 0
-	.equ	se_rg_card2_tbs, 1
-	.equ	se_rg_card2_exg, 0
-	.equ	se_rg_card2_cmp, 1
-
-	.section .rodata
-	.global	se_rg_card2
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_card2_1:
-	.byte	KEYSH , se_rg_card2_key+0
-	.byte	TEMPO , 182*se_rg_card2_tbs/2
-	.byte		VOICE , 125
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 16*se_rg_card2_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte		N24   , Gn5 , v088
-	.byte	W03
-	.byte		VOL   , 32*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        48*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        64*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        80*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        96*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        112*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        127*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_card2:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_card2_pri	@ Priority
-	.byte	se_rg_card2_rev	@ Reverb.
-
-	.word	se_rg_card2_grp
-
-	.word	se_rg_card2_1
-
-	.end