From 2d7119355521d543c528bef70f9aec070c74f51b Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 16:15:35 -0400
Subject: [PATCH] Match se_toreoff.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_toreoff.mid | Bin 0 -> 195 bytes
 sound/songs/se_toreoff.s        |  87 --------------------------------
 4 files changed, 4 insertions(+), 88 deletions(-)
 create mode 100644 sound/songs/midi/se_toreoff.mid
 delete mode 100644 sound/songs/se_toreoff.s

diff --git a/ld_script.txt b/ld_script.txt
index 8408ae5052..827509a261 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -898,7 +898,7 @@ SECTIONS {
         sound/songs/midi/se_rg_excellent.o(.rodata);
         sound/songs/midi/se_rg_nawamiss.o(.rodata);
         sound/songs/midi/se_toreeye.o(.rodata);
-        sound/songs/se_toreoff.o(.rodata);
+        sound/songs/midi/se_toreoff.o(.rodata);
         sound/songs/midi/se_hantei1.o(.rodata);
         sound/songs/midi/se_hantei2.o(.rodata);
         sound/songs/midi/se_curtain.o(.rodata);
diff --git a/songs.mk b/songs.mk
index dcbdc417cb..0d6091ecf9 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1134,5 +1134,8 @@ $(MID_SUBDIR)/se_tk_warpout.s: %.s: %.mid
 $(MID_SUBDIR)/se_toreeye.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V120 -P5
 
+$(MID_SUBDIR)/se_toreoff.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V110 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_toreoff.mid b/sound/songs/midi/se_toreoff.mid
new file mode 100644
index 0000000000000000000000000000000000000000..391f23a3d4138c2966778378abc4038d1414fce5
GIT binary patch
literal 195
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPf_+{10SiU#P(FU!MUgrO$AHi(vzM
zJ;MVA3&sid1&j^$49pXBfV2(+!vuW`#s+;LUta=53nR2eGaL+J*a*}n!owh{!|;&7
zfnlPp17o8t1H(i=1;$1{28dXU3}a&qh+WSJbkRgx6|fQ*H`s)+F_?i7sGDh`Dv+%T
GwgLc1vn!qe

literal 0
HcmV?d00001

diff --git a/sound/songs/se_toreoff.s b/sound/songs/se_toreoff.s
deleted file mode 100644
index d5632eeb76..0000000000
--- a/sound/songs/se_toreoff.s
+++ /dev/null
@@ -1,87 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_toreoff_grp, voicegroup129
-	.equ	se_toreoff_pri, 5
-	.equ	se_toreoff_rev, reverb_set+50
-	.equ	se_toreoff_mvl, 127
-	.equ	se_toreoff_key, 0
-	.equ	se_toreoff_tbs, 1
-	.equ	se_toreoff_exg, 0
-	.equ	se_toreoff_cmp, 1
-
-	.section .rodata
-	.global	se_toreoff
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_toreoff_1:
-	.byte	KEYSH , se_toreoff_key+0
-	.byte	TEMPO , 120*se_toreoff_tbs/2
-	.byte		VOICE , 10
-	.byte		VOL   , 110*se_toreoff_mvl/mxv
-	.byte		BEND  , c_v-8
-	.byte	W01
-	.byte		N01   , Ds3 , v112
-	.byte	W04
-	.byte		        Gs1 
-	.byte	W01
-	.byte		        Bn1 , v056
-	.byte	W04
-	.byte		        Bn1 , v024
-	.byte	W02
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_toreoff_2:
-	.byte	KEYSH , se_toreoff_key+0
-	.byte		VOICE , 82
-	.byte		VOL   , 110*se_toreoff_mvl/mxv
-	.byte		BENDR , 12
-	.byte		LFOS  , 44
-	.byte		BEND  , c_v+0
-	.byte		N01   , Cs3 , v064
-	.byte	W01
-	.byte		        Fs4 , v032
-	.byte	W01
-	.byte		BEND  , c_v+0
-	.byte		N01   , Gs5 , v028
-	.byte	W01
-	.byte		BEND  , c_v+63
-	.byte	W01
-	.byte		        c_v-63
-	.byte		N01   , Cs3 , v036
-	.byte	W01
-	.byte		BEND  , c_v+63
-	.byte	W01
-	.byte		        c_v-63
-	.byte		N01   , Bn4 , v052
-	.byte	W02
-	.byte		BEND  , c_v+0
-	.byte	W02
-	.byte		N01   , Cs1 
-	.byte	W02
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_toreoff:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_toreoff_pri	@ Priority
-	.byte	se_toreoff_rev	@ Reverb.
-
-	.word	se_toreoff_grp
-
-	.word	se_toreoff_1
-	.word	se_toreoff_2
-
-	.end