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

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

diff --git a/ld_script.txt b/ld_script.txt
index b3c9b6f469..59c0d3fb0e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -631,7 +631,7 @@ SECTIONS {
         sound/songs/midi/se_kouka_m.o(.rodata);
         sound/songs/midi/se_kouka_h.o(.rodata);
         sound/songs/midi/se_bowa2.o(.rodata);
-        sound/songs/se_poke_dead.o(.rodata);
+        sound/songs/midi/se_poke_dead.o(.rodata);
         sound/songs/midi/se_nigeru.o(.rodata);
         sound/songs/midi/se_jido_doa.o(.rodata);
         sound/songs/midi/se_naminori.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 6ccdde421f..e46b9e1f0d 100644
--- a/songs.mk
+++ b/songs.mk
@@ -999,5 +999,8 @@ $(MID_SUBDIR)/se_pn_off.s: %.s: %.mid
 $(MID_SUBDIR)/se_pn_on.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
+$(MID_SUBDIR)/se_poke_dead.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_poke_dead.mid b/sound/songs/midi/se_poke_dead.mid
new file mode 100644
index 0000000000000000000000000000000000000000..b6a0df4c8c188d85e9f53ea123041a52f4c8ae92
GIT binary patch
literal 161
zcmeYb$w*;fU|?flWME;C@C_--2J(a%{ztGdvPf_+{10U2($Ql0ug?IL5@$FN#jt_B
zp5Xz51H%N56wU?@22q5x9>c*JhK(XT4D9g?4}mHs2G}rfWY1-43}9f~$X*WR*9!yr
fObA`l42KvPHUSNtWD~&FWWxZYV}yV-8&C-Vacd@T

literal 0
HcmV?d00001

diff --git a/sound/songs/se_poke_dead.s b/sound/songs/se_poke_dead.s
deleted file mode 100644
index 0d66039a2c..0000000000
--- a/sound/songs/se_poke_dead.s
+++ /dev/null
@@ -1,84 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_poke_dead_grp, voicegroup127
-	.equ	se_poke_dead_pri, 5
-	.equ	se_poke_dead_rev, reverb_set+50
-	.equ	se_poke_dead_mvl, 127
-	.equ	se_poke_dead_key, 0
-	.equ	se_poke_dead_tbs, 1
-	.equ	se_poke_dead_exg, 0
-	.equ	se_poke_dead_cmp, 1
-
-	.section .rodata
-	.global	se_poke_dead
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_poke_dead_1:
-	.byte	KEYSH , se_poke_dead_key+0
-	.byte	TEMPO , 90*se_poke_dead_tbs/2
-	.byte		VOICE , 90
-	.byte		VOL   , 110*se_poke_dead_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N09   , Cn4 , v100
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_poke_dead_2:
-	.byte	KEYSH , se_poke_dead_key+0
-	.byte		VOICE , 124
-	.byte		BENDR , 12
-	.byte		VOL   , 82*se_poke_dead_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N05   , Gs4 , v060
-	.byte	W03
-	.byte		VOL   , 94*se_poke_dead_mvl/mxv
-	.byte	W03
-	.byte		        103*se_poke_dead_mvl/mxv
-	.byte		N22   
-	.byte	W03
-	.byte		VOL   , 110*se_poke_dead_mvl/mxv
-	.byte	W03
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-se_poke_dead_3:
-	.byte	KEYSH , se_poke_dead_key+0
-	.byte		VOICE , 0
-	.byte		VOL   , 110*se_poke_dead_mvl/mxv
-	.byte		N06   , Cn3 , v080
-	.byte	W06
-	.byte		N18   , Cn3 , v092
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_poke_dead:
-	.byte	3	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_poke_dead_pri	@ Priority
-	.byte	se_poke_dead_rev	@ Reverb.
-
-	.word	se_poke_dead_grp
-
-	.word	se_poke_dead_1
-	.word	se_poke_dead_2
-	.word	se_poke_dead_3
-
-	.end