Match mus_me_wasure.mid

5 files changed, 5 insertions, 202 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 13dfc0584..8c5717896 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -861,7 +861,7 @@ SECTIONS {
         sound/songs/midi/mus_fune_kan.o(.rodata);
         sound/songs/midi/mus_me_shinka.o(.rodata);
         sound/songs/mus_shinka.o(.rodata);
-        sound/songs/mus_me_wasure.o(.rodata);
+        sound/songs/midi/mus_me_wasure.o(.rodata);
         sound/songs/mus_syoujoeye.o(.rodata);
         sound/songs/midi/mus_boyeye.o(.rodata);
         sound/songs/midi/mus_dan02.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 7327f0bf8..e2b941054 100644
--- a/songs.mk
+++ b/songs.mk
@@ -279,6 +279,9 @@ $(MID_SUBDIR)/mus_me_tama.s: %.s: %.mid
 $(MID_SUBDIR)/mus_me_tore_eye.s: %.s: %.mid
 	$(MID) $< $@ -G105 -R$(STD_REVERB) -V090 -P5
 
+$(MID_SUBDIR)/mus_me_wasure.s: %.s: %.mid
+	$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
+
 $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid
 	$(MID) $< $@ -G017 -R$(STD_REVERB)
 
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 711d3d0e7..0b79e8b80 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -382,7 +382,7 @@ gSongTable:: @ 86B49F0
 	song mus_fune_kan, 0, 0         @ Oceanic Museum
 	song mus_me_shinka, 2, 2        @ Evolution (Intro)
 	song mus_shinka, 0, 0           @ Evolution
-	song mus_me_wasure, 2, 2        @ Move Deleted/Messed Up Appeal
+	song mus_me_wasure, 2, 2        @ Move Deleted
 	song mus_syoujoeye, 0, 0        @ Encounter! Tuber
 	song mus_boyeye, 0, 0           @ Trainers' Eyes Meet (Youngster)
 	song mus_dan02, 0, 0            @ Abandoned Ship
diff --git a/sound/songs/midi/mus_me_wasure.mid b/sound/songs/midi/mus_me_wasure.mid
new file mode 100644
index 000000000..16fe3e1a0
--- /dev/null
+++ b/sound/songs/midi/mus_me_wasure.mid
diff --git a/sound/songs/mus_me_wasure.s b/sound/songs/mus_me_wasure.s
deleted file mode 100644
index f2545252d..000000000
--- a/sound/songs/mus_me_wasure.s
+++ /dev/null
@@ -1,200 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	mus_me_wasure_grp, voicegroup012
-	.equ	mus_me_wasure_pri, 5
-	.equ	mus_me_wasure_rev, reverb_set+50
-	.equ	mus_me_wasure_mvl, 127
-	.equ	mus_me_wasure_key, 0
-	.equ	mus_me_wasure_tbs, 1
-	.equ	mus_me_wasure_exg, 0
-	.equ	mus_me_wasure_cmp, 1
-
-	.section .rodata
-	.global	mus_me_wasure
-	.align	2
-
-@********************** Track  1 **********************@
-
-mus_me_wasure_1:
-	.byte	KEYSH , mus_me_wasure_key+0
-	.byte	TEMPO , 150*mus_me_wasure_tbs/2
-	.byte	W12
-	.byte		VOICE , 13
-	.byte		VOL   , 90*mus_me_wasure_mvl/mxv
-	.byte		N06   , En3 , v068
-	.byte	W06
-	.byte		        Bn3 
-	.byte	W06
-	.byte		        En4 
-	.byte	W06
-	.byte		        Bn4 
-	.byte	W06
-	.byte		N12   , Ds5 , v088
-	.byte	W09
-	.byte		        Cn5 
-	.byte	W12
-	.byte		        As4 
-	.byte	W12
-	.byte		        Gn4 
-	.byte	W12
-	.byte		        En4 
-	.byte	W12
-	.byte		N06   , En5 
-	.byte	W12
-	.byte		N12   
-	.byte	W24
-	.byte	W03
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-mus_me_wasure_2:
-	.byte	KEYSH , mus_me_wasure_key+0
-	.byte	W12
-	.byte		VOICE , 13
-	.byte		VOL   , 90*mus_me_wasure_mvl/mxv
-	.byte	W03
-	.byte		N06   , Gs3 , v068
-	.byte	W06
-	.byte		        Cs4 
-	.byte	W06
-	.byte		        Gs4 
-	.byte	W06
-	.byte		        Cs5 
-	.byte	W03
-	.byte	W03
-	.byte		N12   , En5 , v088
-	.byte	W09
-	.byte		        Cs5 
-	.byte	W12
-	.byte		        Bn4 
-	.byte	W12
-	.byte		        Gs4 
-	.byte	W12
-	.byte		        En4 
-	.byte	W12
-	.byte		N06   , En5 
-	.byte	W12
-	.byte		N12   
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-mus_me_wasure_3:
-	.byte	KEYSH , mus_me_wasure_key+0
-	.byte	W12
-	.byte		BEND  , c_v+1
-	.byte	W24
-	.byte		VOICE , 13
-	.byte		VOL   , 90*mus_me_wasure_mvl/mxv
-	.byte		PAN   , c_v-48
-	.byte	W12
-	.byte		N12   , En5 , v012
-	.byte	W09
-	.byte		        Cs5 
-	.byte	W12
-	.byte		        Bn4 
-	.byte	W12
-	.byte		        Gs4 
-	.byte	W12
-	.byte		        En4 
-	.byte	W12
-	.byte		N06   , En5 
-	.byte	W12
-	.byte		N12   
-	.byte	W15
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  4 **********************@
-
-mus_me_wasure_4:
-	.byte	KEYSH , mus_me_wasure_key+0
-	.byte	W12
-	.byte		BEND  , c_v-2
-	.byte	W24
-	.byte		VOICE , 13
-	.byte		VOL   , 90*mus_me_wasure_mvl/mxv
-	.byte		PAN   , c_v+48
-	.byte	W24
-	.byte		N12   , En5 , v012
-	.byte	W09
-	.byte		        Cs5 
-	.byte	W12
-	.byte		        Bn4 
-	.byte	W12
-	.byte		        Gs4 
-	.byte	W12
-	.byte		        En4 
-	.byte	W12
-	.byte		N06   , En5 
-	.byte	W12
-	.byte		N12   
-	.byte	W03
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  5 **********************@
-
-mus_me_wasure_5:
-	.byte	KEYSH , mus_me_wasure_key+0
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte	W12
-	.byte		VOICE , 84
-	.byte		VOL   , 90*mus_me_wasure_mvl/mxv
-	.byte	W21
-	.byte		N12   , En2 , v072
-	.byte	W03
-	.byte	W56
-	.byte	W01
-	.byte		        En3 
-	.byte	W12
-	.byte		        En4 
-	.byte	W24
-	.byte	W03
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  6 **********************@
-
-mus_me_wasure_6:
-	.byte	KEYSH , mus_me_wasure_key+0
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte	W12
-	.byte		VOICE , 85
-	.byte		VOL   , 90*mus_me_wasure_mvl/mxv
-	.byte		BEND  , c_v+8
-	.byte	W24
-	.byte		N12   , En2 , v052
-	.byte	W60
-	.byte		        En3 
-	.byte	W12
-	.byte		        En4 
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-mus_me_wasure:
-	.byte	6	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	mus_me_wasure_pri	@ Priority
-	.byte	mus_me_wasure_rev	@ Reverb.
-
-	.word	mus_me_wasure_grp
-
-	.word	mus_me_wasure_1
-	.word	mus_me_wasure_2
-	.word	mus_me_wasure_3
-	.word	mus_me_wasure_4
-	.word	mus_me_wasure_5
-	.word	mus_me_wasure_6
-
-	.end