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

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

diff --git a/ld_script.txt b/ld_script.txt
index b0d2cc476..cc3823cbc 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -664,7 +664,7 @@ SECTIONS {
         sound/songs/midi/se_c_maku_u.o(.rodata);
         sound/songs/midi/se_c_maku_d.o(.rodata);
         sound/songs/midi/se_c_pasi.o(.rodata);
-        sound/songs/se_c_syu.o(.rodata);
+        sound/songs/midi/se_c_syu.o(.rodata);
         sound/songs/midi/se_c_pikon.o(.rodata);
         sound/songs/se_reapoke.o(.rodata);
         sound/songs/se_op_basyu.o(.rodata);
diff --git a/songs.mk b/songs.mk
index f6c9113e8..7c2b9b583 100644
--- a/songs.mk
+++ b/songs.mk
@@ -825,5 +825,8 @@ $(MID_SUBDIR)/se_c_pasi.s: %.s: %.mid
 $(MID_SUBDIR)/se_c_pikon.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
 
+$(MID_SUBDIR)/se_c_syu.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -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 141105739..d3c0bb838 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -101,7 +101,7 @@ gSongTable:: @ 86B49F0
 	song se_c_maku_u, 1, 1          @ Contest - Curtain Rises
 	song se_c_maku_d, 1, 1          @ Contest - Curtain Falls
 	song se_c_pasi, 1, 1            @ Contest - Inflict Status
-	song se_c_syu, 1, 1
+	song se_c_syu, 1, 1             @ Contest - Pokémon Switches Out
 	song se_c_pikon, 1, 1           @ Contest - Pokémon Switches In
 	song se_reapoke, 1, 1           @ Shiny Pokémon
 	song se_op_basyu, 1, 1          @ Opening Movie -> Title Screen whoosh
diff --git a/sound/songs/midi/se_c_syu.mid b/sound/songs/midi/se_c_syu.mid
new file mode 100644
index 0000000000000000000000000000000000000000..3766d5f51a860011c52b1145334a6e72e42538e2
GIT binary patch
literal 112
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPf_+{10SilWJi2ug?ILvS&D;!mxqe
qjo|@M-Gqb!#trNVK(;-Qt_RZfj1374K=~vf+W{!Afh^7lGzI`-0~<sD

literal 0
HcmV?d00001

diff --git a/sound/songs/se_c_syu.s b/sound/songs/se_c_syu.s
deleted file mode 100644
index c4d051397..000000000
--- a/sound/songs/se_c_syu.s
+++ /dev/null
@@ -1,54 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_c_syu_grp, voicegroup128
-	.equ	se_c_syu_pri, 5
-	.equ	se_c_syu_rev, reverb_set+50
-	.equ	se_c_syu_mvl, 127
-	.equ	se_c_syu_key, 0
-	.equ	se_c_syu_tbs, 1
-	.equ	se_c_syu_exg, 0
-	.equ	se_c_syu_cmp, 1
-
-	.section .rodata
-	.global	se_c_syu
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_c_syu_1:
-	.byte	KEYSH , se_c_syu_key+0
-	.byte	TEMPO , 150*se_c_syu_tbs/2
-	.byte		VOICE , 36
-	.byte		VOL   , 49*se_c_syu_mvl/mxv
-	.byte		BEND  , c_v-64
-	.byte		N03   , Cn6 , v112
-	.byte	W01
-	.byte		VOL   , 68*se_c_syu_mvl/mxv
-	.byte		BEND  , c_v-1
-	.byte	W01
-	.byte		VOL   , 90*se_c_syu_mvl/mxv
-	.byte		BEND  , c_v+63
-	.byte	W01
-	.byte		VOL   , 69*se_c_syu_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N02   , Cn6 , v040
-	.byte	W01
-	.byte		VOL   , 90*se_c_syu_mvl/mxv
-	.byte		BEND  , c_v+63
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_c_syu:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_c_syu_pri	@ Priority
-	.byte	se_c_syu_rev	@ Reverb.
-
-	.word	se_c_syu_grp
-
-	.word	se_c_syu_1
-
-	.end