From b706b60622a3a65cbcdca3e1789d433284e87c1d Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Sun, 24 Mar 2019 15:52:19 -0400
Subject: [PATCH] Match se_tamago.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 8a75381dd..cfe0fba54 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -747,7 +747,7 @@ SECTIONS {
         sound/songs/midi/se_pn_on.o(.rodata);
         sound/songs/midi/se_pn_off.o(.rodata);
         sound/songs/midi/se_z_search.o(.rodata);
-        sound/songs/se_tamago.o(.rodata);
+        sound/songs/midi/se_tamago.o(.rodata);
         sound/songs/se_tb_start.o(.rodata);
         sound/songs/se_tb_kon.o(.rodata);
         sound/songs/se_tb_kara.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 1e1c1ebbc..d51ef446a 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1104,5 +1104,8 @@ $(MID_SUBDIR)/se_t_ooame_e.s: %.s: %.mid
 $(MID_SUBDIR)/se_tama.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P5
 
+$(MID_SUBDIR)/se_tamago.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_tamago.mid b/sound/songs/midi/se_tamago.mid
new file mode 100644
index 0000000000000000000000000000000000000000..67d3959eb77cfc012bbc5966e836f37107869172
GIT binary patch
literal 271
zcmYMtJ&M9`6a?^j@#BeFxe6kd7FN5hg@xh@|0du{M8(2nNwJ`fqIKd8;!WZW;!Vs+
z;wXWwhWC2|V>^F7fHDLHv~B0O<Mn}TRTQgTLH1K9cS2-e$X_QUEyT?_sv~HC2gZoD
zfrMKia(oFLAZZ{nBm+r$h}^yv>x9jz#5!l%Opm!>9+)08DCtRbZ|Pdphz><NqBRL!
z$p7{)Zk*(Bim~25admyUu#w^$*Ud^U8(1j}-Q+%_4_?mBlHPwgJ0888`<Y&UJC~jk
C;z3IQ

literal 0
HcmV?d00001

diff --git a/sound/songs/se_tamago.s b/sound/songs/se_tamago.s
deleted file mode 100644
index dfd2a51fb..000000000
--- a/sound/songs/se_tamago.s
+++ /dev/null
@@ -1,111 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_tamago_grp, voicegroup128
-	.equ	se_tamago_pri, 5
-	.equ	se_tamago_rev, reverb_set+50
-	.equ	se_tamago_mvl, 127
-	.equ	se_tamago_key, 0
-	.equ	se_tamago_tbs, 1
-	.equ	se_tamago_exg, 0
-	.equ	se_tamago_cmp, 1
-
-	.section .rodata
-	.global	se_tamago
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_tamago_1:
-	.byte	KEYSH , se_tamago_key+0
-	.byte	TEMPO , 150*se_tamago_tbs/2
-	.byte		VOICE , 21
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 120*se_tamago_mvl/mxv
-	.byte		BEND  , c_v+1
-	.byte		N01   , Bn5 , v127
-	.byte	W01
-	.byte		        Cn5 , v100
-	.byte	W01
-	.byte		VOICE , 18
-	.byte		N01   , Cn4 , v127
-	.byte	W02
-	.byte		VOICE , 36
-	.byte		N19   , Cn6 , v040
-	.byte	W02
-	.byte		VOL   , 63*se_tamago_mvl/mxv
-	.byte		BEND  , c_v+5
-	.byte	W01
-	.byte		VOL   , 77*se_tamago_mvl/mxv
-	.byte		BEND  , c_v+13
-	.byte	W01
-	.byte		VOL   , 91*se_tamago_mvl/mxv
-	.byte		BEND  , c_v+21
-	.byte	W01
-	.byte		VOL   , 106*se_tamago_mvl/mxv
-	.byte		BEND  , c_v+33
-	.byte	W01
-	.byte		VOL   , 120*se_tamago_mvl/mxv
-	.byte	W05
-	.byte		        109*se_tamago_mvl/mxv
-	.byte	W01
-	.byte		        102*se_tamago_mvl/mxv
-	.byte	W02
-	.byte		        84*se_tamago_mvl/mxv
-	.byte	W01
-	.byte		        68*se_tamago_mvl/mxv
-	.byte	W01
-	.byte		        56*se_tamago_mvl/mxv
-	.byte	W01
-	.byte		        24*se_tamago_mvl/mxv
-	.byte	W01
-	.byte		        10*se_tamago_mvl/mxv
-	.byte	W02
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_tamago_2:
-	.byte	KEYSH , se_tamago_key+0
-	.byte		VOL   , 120*se_tamago_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+1
-	.byte	W07
-	.byte		VOICE , 46
-	.byte		N01   , Cn6 , v100
-	.byte	W02
-	.byte		BEND  , c_v+4
-	.byte		N01   , Gn5 , v088
-	.byte	W03
-	.byte		BEND  , c_v+8
-	.byte		N01   , Cn6 , v072
-	.byte	W02
-	.byte		BEND  , c_v+16
-	.byte		N01   , Gn5 , v056
-	.byte	W02
-	.byte		BEND  , c_v+23
-	.byte		N01   , Cn6 , v040
-	.byte	W03
-	.byte		BEND  , c_v+33
-	.byte		N01   , Gn5 , v028
-	.byte	W02
-	.byte		BEND  , c_v+53
-	.byte		N01   , Cn6 , v012
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_tamago:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_tamago_pri	@ Priority
-	.byte	se_tamago_rev	@ Reverb.
-
-	.word	se_tamago_grp
-
-	.word	se_tamago_1
-	.word	se_tamago_2
-
-	.end