From 6c890f7d9a3c759b7b2f54cca0debe803d491532 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 15:01:35 -0400
Subject: [PATCH] Match se_card.mid

---
 ld_script.txt                |   2 +-
 songs.mk                     |   3 ++
 sound/songs/midi/se_card.mid | Bin 0 -> 184 bytes
 sound/songs/se_card.s        |  84 -----------------------------------
 4 files changed, 4 insertions(+), 85 deletions(-)
 create mode 100644 sound/songs/midi/se_card.mid
 delete mode 100644 sound/songs/se_card.s

diff --git a/ld_script.txt b/ld_script.txt
index cc3823cbcb..ed56654709 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -618,7 +618,7 @@ SECTIONS {
         sound/songs/se_track_haiki.o(.rodata);
         sound/songs/se_track_door.o(.rodata);
         sound/songs/se_moter.o(.rodata);
-        sound/songs/se_card.o(.rodata);
+        sound/songs/midi/se_card.o(.rodata);
         sound/songs/se_save.o(.rodata);
         sound/songs/se_kon.o(.rodata);
         sound/songs/se_kon2.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 7c2b9b583f..ad1b28f271 100644
--- a/songs.mk
+++ b/songs.mk
@@ -828,5 +828,8 @@ $(MID_SUBDIR)/se_c_pikon.s: %.s: %.mid
 $(MID_SUBDIR)/se_c_syu.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
 
+$(MID_SUBDIR)/se_card.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_card.mid b/sound/songs/midi/se_card.mid
new file mode 100644
index 0000000000000000000000000000000000000000..a6832a85f6a72d0d905afa8bcbba75086b821441
GIT binary patch
literal 184
zcmXZWJqp4=6a?UTo9MF;8-GZd0|cU_t!Wk{1Yrw{*oXl^un@$;BI#^%ls$q+$xYTN
ztUiXBVoG<t02o7Hkd*FmW11rzV~LXq!XX;1mIyii)dyb#znDUE3~138nRq=(R{&m_
zt4z8I(%aSyc(aQ|Q&G$Hi|K4Q8gP%iK50W6T2n_IE$E(Z=#HjzOJ{T~orU3@AGAs<
Apa1{>

literal 0
HcmV?d00001

diff --git a/sound/songs/se_card.s b/sound/songs/se_card.s
deleted file mode 100644
index 703e516d54..0000000000
--- a/sound/songs/se_card.s
+++ /dev/null
@@ -1,84 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_card_grp, voicegroup127
-	.equ	se_card_pri, 4
-	.equ	se_card_rev, reverb_set+50
-	.equ	se_card_mvl, 127
-	.equ	se_card_key, 0
-	.equ	se_card_tbs, 1
-	.equ	se_card_exg, 0
-	.equ	se_card_cmp, 1
-
-	.section .rodata
-	.global	se_card
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_card_1:
-	.byte	KEYSH , se_card_key+0
-	.byte	TEMPO , 180*se_card_tbs/2
-	.byte		VOICE , 2
-	.byte		BENDR , 12
-	.byte		VOL   , 37*se_card_mvl/mxv
-	.byte		BEND  , c_v+63
-	.byte		N02   , Gn3 , v044
-	.byte	W01
-	.byte		VOL   , 73*se_card_mvl/mxv
-	.byte	W01
-	.byte		        100*se_card_mvl/mxv
-	.byte		N01   , Gn4 
-	.byte	W02
-	.byte		N30   , Cn4 , v127
-	.byte	W02
-	.byte		BEND  , c_v+59
-	.byte	W01
-	.byte		VOL   , 3*se_card_mvl/mxv
-	.byte	W01
-	.byte		        25*se_card_mvl/mxv
-	.byte	W01
-	.byte		        56*se_card_mvl/mxv
-	.byte		BEND  , c_v+55
-	.byte	W01
-	.byte		VOL   , 77*se_card_mvl/mxv
-	.byte	W02
-	.byte		        100*se_card_mvl/mxv
-	.byte		BEND  , c_v+46
-	.byte	W03
-	.byte		VOL   , 92*se_card_mvl/mxv
-	.byte		BEND  , c_v+37
-	.byte	W03
-	.byte		VOL   , 79*se_card_mvl/mxv
-	.byte		BEND  , c_v+28
-	.byte	W03
-	.byte		VOL   , 66*se_card_mvl/mxv
-	.byte		BEND  , c_v+20
-	.byte	W03
-	.byte		VOL   , 52*se_card_mvl/mxv
-	.byte		BEND  , c_v+11
-	.byte	W03
-	.byte		VOL   , 38*se_card_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte	W03
-	.byte		VOL   , 25*se_card_mvl/mxv
-	.byte		BEND  , c_v-7
-	.byte	W03
-	.byte		VOL   , 11*se_card_mvl/mxv
-	.byte		BEND  , c_v-16
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_card:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_card_pri	@ Priority
-	.byte	se_card_rev	@ Reverb.
-
-	.word	se_card_grp
-
-	.word	se_card_1
-
-	.end