From c0064134d1dbf1fda968de2a78565fd2abb875e6 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 10 Oct 2018 15:14:49 -0400
Subject: [PATCH] Match se_dansa.mid

---
 ld_script.txt                 |   2 +-
 songs.mk                      |   3 +++
 sound/songs/midi/se_dansa.mid | Bin 0 -> 83 bytes
 sound/songs/se_dansa.s        |  46 ----------------------------------
 4 files changed, 4 insertions(+), 47 deletions(-)
 create mode 100644 sound/songs/midi/se_dansa.mid
 delete mode 100644 sound/songs/se_dansa.s

diff --git a/ld_script.txt b/ld_script.txt
index b2168ba9a..e03538e5c 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -574,7 +574,7 @@ SECTIONS {
         sound/songs/se_wall_hit.o(.rodata);
         sound/songs/se_door.o(.rodata);
         sound/songs/se_kaidan.o(.rodata);
-        sound/songs/se_dansa.o(.rodata);
+        sound/songs/midi/se_dansa.o(.rodata);
         sound/songs/se_jitensya.o(.rodata);
         sound/songs/se_kouka_l.o(.rodata);
         sound/songs/se_kouka_m.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 179e641ec..864e3597f 100644
--- a/songs.mk
+++ b/songs.mk
@@ -837,5 +837,8 @@ $(MID_SUBDIR)/se_curtain.s: %.s: %.mid
 $(MID_SUBDIR)/se_curtain1.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
+$(MID_SUBDIR)/se_dansa.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_dansa.mid b/sound/songs/midi/se_dansa.mid
new file mode 100644
index 0000000000000000000000000000000000000000..61eae0318ea6e024b932f6590044ecdb05280bf4
GIT binary patch
literal 83
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SiU#P(FU!MUgrNnR`lwkvV
gJ;MVAD~1WiCQJ>+3=9Xt7$!K!ur)X{FalKq0LK~<*Z=?k

literal 0
HcmV?d00001

diff --git a/sound/songs/se_dansa.s b/sound/songs/se_dansa.s
deleted file mode 100644
index ccd7c4742..000000000
--- a/sound/songs/se_dansa.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_dansa_grp, voicegroup127
-	.equ	se_dansa_pri, 4
-	.equ	se_dansa_rev, reverb_set+50
-	.equ	se_dansa_mvl, 127
-	.equ	se_dansa_key, 0
-	.equ	se_dansa_tbs, 1
-	.equ	se_dansa_exg, 0
-	.equ	se_dansa_cmp, 1
-
-	.section .rodata
-	.global	se_dansa
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_dansa_1:
-	.byte	KEYSH , se_dansa_key+0
-	.byte	TEMPO , 120*se_dansa_tbs/2
-	.byte		VOICE , 85
-	.byte		VOL   , 100*se_dansa_mvl/mxv
-	.byte		BEND  , c_v-6
-	.byte		N02   , Ds2 , v052
-	.byte	W02
-	.byte		VOICE , 86
-	.byte		N06   , Gn3 , v092
-	.byte	W01
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_dansa:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_dansa_pri	@ Priority
-	.byte	se_dansa_rev	@ Reverb.
-
-	.word	se_dansa_grp
-
-	.word	se_dansa_1
-
-	.end