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

---
 ld_script.txt                 |   2 +-
 songs.mk                      |   3 ++
 sound/song_table.inc          |   2 +-
 sound/songs/midi/se_daugi.mid | Bin 0 -> 149 bytes
 sound/songs/se_daugi.s        |  80 ----------------------------------
 5 files changed, 5 insertions(+), 82 deletions(-)
 create mode 100644 sound/songs/midi/se_daugi.mid
 delete mode 100644 sound/songs/se_daugi.s

diff --git a/ld_script.txt b/ld_script.txt
index e03538e5ce..ec3dd2f723 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -636,7 +636,7 @@ SECTIONS {
         sound/songs/se_toy_c1.o(.rodata);
         sound/songs/se_mizu.o(.rodata);
         sound/songs/se_hashi.o(.rodata);
-        sound/songs/se_daugi.o(.rodata);
+        sound/songs/midi/se_daugi.o(.rodata);
         sound/songs/se_pinpon.o(.rodata);
         sound/songs/se_fuusen1.o(.rodata);
         sound/songs/se_fuusen2.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 864e3597f6..4fd9964a15 100644
--- a/songs.mk
+++ b/songs.mk
@@ -840,5 +840,8 @@ $(MID_SUBDIR)/se_curtain1.s: %.s: %.mid
 $(MID_SUBDIR)/se_dansa.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
 
+$(MID_SUBDIR)/se_daugi.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/song_table.inc b/sound/song_table.inc
index c166299a90..0cced3b1fd 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -73,7 +73,7 @@ gSongTable:: @ 86B49F0
 	song se_toy_c1, 2, 2            @ Note High C
 	song se_mizu, 2, 2              @ Puddle
 	song se_hashi, 2, 2             @ Boardwalk
-	song se_daugi, 1, 1             @ Slots Credits
+	song se_daugi, 1, 1             @ Slots - Credits
 	song se_pinpon, 1, 1            @ Ding-dong!
 	song se_fuusen1, 2, 2           @ Red Balloon
 	song se_fuusen2, 2, 2           @ Blue Balloon
diff --git a/sound/songs/midi/se_daugi.mid b/sound/songs/midi/se_daugi.mid
new file mode 100644
index 0000000000000000000000000000000000000000..9b6538a7026ab5d87d562d47daf2cebaa4019c2e
GIT binary patch
literal 149
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPy6;{10SiSLb8+ug?ILGG#ar$*@6$
zhk?DG;Q@m^!vwQ><_0qch6(odj1Be-Ob6H)Cb*<9H@Gk`PKfjnYKUZDLTFZJILODa
f5vcPag9XDxpt4362Ih$_HXxdDVx)~wBSbj>Ya}A1

literal 0
HcmV?d00001

diff --git a/sound/songs/se_daugi.s b/sound/songs/se_daugi.s
deleted file mode 100644
index 88793920d3..0000000000
--- a/sound/songs/se_daugi.s
+++ /dev/null
@@ -1,80 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_daugi_grp, voicegroup127
-	.equ	se_daugi_pri, 5
-	.equ	se_daugi_rev, reverb_set+50
-	.equ	se_daugi_mvl, 127
-	.equ	se_daugi_key, 0
-	.equ	se_daugi_tbs, 1
-	.equ	se_daugi_exg, 0
-	.equ	se_daugi_cmp, 1
-
-	.section .rodata
-	.global	se_daugi
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_daugi_1:
-	.byte	KEYSH , se_daugi_key+0
-	.byte	TEMPO , 128*se_daugi_tbs/2
-	.byte		VOICE , 89
-	.byte		BENDR , 12
-	.byte		VOL   , 90*se_daugi_mvl/mxv
-	.byte		BEND  , c_v-1
-	.byte		N03   , Fs2 , v127
-	.byte	W03
-	.byte		N01   , Ds3 
-	.byte	W03
-	.byte		VOICE , 6
-	.byte		N03   , Gs3 , v100
-	.byte	W03
-	.byte	W01
-	.byte		N18   , Fn5 , v072
-	.byte	W02
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_daugi_2:
-	.byte	KEYSH , se_daugi_key+0
-	.byte		VOICE , 14
-	.byte		VOL   , 90*se_daugi_mvl/mxv
-	.byte		BEND  , c_v-8
-	.byte		N03   , Gs3 , v100
-	.byte	W03
-	.byte	W03
-	.byte		        Gs3 , v060
-	.byte	W03
-	.byte	W01
-	.byte		N18   , Fn5 
-	.byte	W02
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_daugi:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_daugi_pri	@ Priority
-	.byte	se_daugi_rev	@ Reverb.
-
-	.word	se_daugi_grp
-
-	.word	se_daugi_1
-	.word	se_daugi_2
-
-	.end