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

---
 ld_script.txt                    |   2 +-
 songs.mk                         |   3 +
 sound/songs/midi/se_rg_card3.mid | Bin 0 -> 269 bytes
 sound/songs/se_rg_card3.s        | 110 -------------------------------
 4 files changed, 4 insertions(+), 111 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_card3.mid
 delete mode 100644 sound/songs/se_rg_card3.s

diff --git a/ld_script.txt b/ld_script.txt
index 96fd2cc20..1548f8227 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -866,7 +866,7 @@ SECTIONS {
         sound/songs/se_rg_w_door.o(.rodata);
         sound/songs/midi/se_rg_card1.o(.rodata);
         sound/songs/midi/se_rg_card2.o(.rodata);
-        sound/songs/se_rg_card3.o(.rodata);
+        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);
diff --git a/songs.mk b/songs.mk
index ab9873e04..bf463b17f 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1020,5 +1020,8 @@ $(MID_SUBDIR)/se_rg_card1.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_card2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
+$(MID_SUBDIR)/se_rg_card3.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V112 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_card3.mid b/sound/songs/midi/se_rg_card3.mid
new file mode 100644
index 0000000000000000000000000000000000000000..47cc451d0d9e7d16197074d88900bf09f19dbeda
GIT binary patch
literal 269
zcmYk$u?oU46a~;*pPDER1(z<Cj!rtd7AHG&5Hbi_x^xgk4bFn~57IxWi?jZT|KU(y
zO2ID4&B-NsvD#+<`fxz-Vs$z2X^d*qbvm9zwWi+ki)xPM>WSA3r7tm&@CSAkHw?pO
z{UC%%H023UiU=m<oZ8GK7berhOgVp9lV+O!i7Vp76tqY~9GScpacj%uwuoDnMof$P
fd6P-bWb^7jy^r@54?AvzLhb0TK!pnIe&*H><N7^(

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_card3.s b/sound/songs/se_rg_card3.s
deleted file mode 100644
index e456c6bbe..000000000
--- a/sound/songs/se_rg_card3.s
+++ /dev/null
@@ -1,110 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_card3_grp, voicegroup129
-	.equ	se_rg_card3_pri, 5
-	.equ	se_rg_card3_rev, reverb_set+50
-	.equ	se_rg_card3_mvl, 127
-	.equ	se_rg_card3_key, 0
-	.equ	se_rg_card3_tbs, 1
-	.equ	se_rg_card3_exg, 0
-	.equ	se_rg_card3_cmp, 1
-
-	.section .rodata
-	.global	se_rg_card3
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_card3_1:
-	.byte	KEYSH , se_rg_card3_key+0
-	.byte	TEMPO , 174*se_rg_card3_tbs/2
-	.byte		VOICE , 46
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 112*se_rg_card3_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 112*se_rg_card3_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N03   , An5 , v112
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte		N03   , Bn5 
-	.byte	W03
-	.byte		VOL   , 112*se_rg_card3_mvl/mxv
-	.byte		PAN   , c_v-48
-	.byte		N06   , En6 
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		        112*se_rg_card3_mvl/mxv
-	.byte		PAN   , c_v+48
-	.byte		N06   , En6 , v040
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-48
-	.byte		VOL   , 97*se_rg_card3_mvl/mxv
-	.byte		N06   , En6 , v032
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v+48
-	.byte		VOL   , 96*se_rg_card3_mvl/mxv
-	.byte		N06   , En6 , v024
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-48
-	.byte		VOL   , 80*se_rg_card3_mvl/mxv
-	.byte		N06   , En6 , v016
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v+48
-	.byte		VOL   , 80*se_rg_card3_mvl/mxv
-	.byte		N06   , En6 , v012
-	.byte	W03
-	.byte		VOL   , 48*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		N06   , En6 , v008
-	.byte	W03
-	.byte		VOL   , 2*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_card3_2:
-	.byte	KEYSH , se_rg_card3_key+0
-	.byte		VOICE , 124
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte		N03   , Cn5 , v092
-	.byte	W06
-	.byte		        Cn5 , v032
-	.byte	W18
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_card3:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_card3_pri	@ Priority
-	.byte	se_rg_card3_rev	@ Reverb.
-
-	.word	se_rg_card3_grp
-
-	.word	se_rg_card3_1
-	.word	se_rg_card3_2
-
-	.end