Match mus_me_waza.mid

5 files changed, 5 insertions, 329 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 8c5717896..173245faf 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -855,7 +855,7 @@ SECTIONS {
         sound/songs/midi/mus_me_bachi.o(.rodata);
         sound/songs/midi/mus_fanfa4.o(.rodata);
         sound/songs/midi/mus_fanfa5.o(.rodata);
-        sound/songs/mus_me_waza.o(.rodata);
+        sound/songs/midi/mus_me_waza.o(.rodata);
         sound/songs/midi/mus_bijyutu.o(.rodata);
         sound/songs/midi/mus_dooro_x4.o(.rodata);
         sound/songs/midi/mus_fune_kan.o(.rodata);
diff --git a/songs.mk b/songs.mk
index e2b941054..db008b381 100644
--- a/songs.mk
+++ b/songs.mk
@@ -282,6 +282,9 @@ $(MID_SUBDIR)/mus_me_tore_eye.s: %.s: %.mid
 $(MID_SUBDIR)/mus_me_wasure.s: %.s: %.mid
 	$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
 
+$(MID_SUBDIR)/mus_me_waza.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 0b79e8b80..6292644a7 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -376,7 +376,7 @@ gSongTable:: @ 86B49F0
 	song mus_me_bachi, 2, 2         @ Obtained a Badge!
 	song mus_fanfa4, 2, 2           @ Obtained an Item!
 	song mus_fanfa5, 2, 2           @ Congratulations! Your Pokémon Evolved!
-	song mus_me_waza, 2, 2          @ Obtained a TM/HM!
+	song mus_me_waza, 2, 2          @ Obtained a TM!
 	song mus_bijyutu, 0, 0          @ Museum
 	song mus_dooro_x4, 0, 0         @ Introductions
 	song mus_fune_kan, 0, 0         @ Oceanic Museum
diff --git a/sound/songs/midi/mus_me_waza.mid b/sound/songs/midi/mus_me_waza.mid
new file mode 100644
index 000000000..ac132f5ff
--- /dev/null
+++ b/sound/songs/midi/mus_me_waza.mid
diff --git a/sound/songs/mus_me_waza.s b/sound/songs/mus_me_waza.s
deleted file mode 100644
index f4bae353c..000000000
--- a/sound/songs/mus_me_waza.s
+++ /dev/null
@@ -1,327 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	mus_me_waza_grp, voicegroup012
-	.equ	mus_me_waza_pri, 5
-	.equ	mus_me_waza_rev, reverb_set+50
-	.equ	mus_me_waza_mvl, 127
-	.equ	mus_me_waza_key, 0
-	.equ	mus_me_waza_tbs, 1
-	.equ	mus_me_waza_exg, 0
-	.equ	mus_me_waza_cmp, 1
-
-	.section .rodata
-	.global	mus_me_waza
-	.align	2
-
-@********************** Track  1 **********************@
-
-mus_me_waza_1:
-	.byte	KEYSH , mus_me_waza_key+0
-	.byte	W12
-	.byte	TEMPO , 140*mus_me_waza_tbs/2
-	.byte		VOICE , 73
-	.byte		PAN   , c_v-47
-	.byte		VOL   , 90*mus_me_waza_mvl/mxv
-	.byte		N06   , Dn4 , v096
-	.byte	W12
-	.byte		        Gn3 
-	.byte	W06
-	.byte		        Bn3 
-	.byte	W06
-	.byte		N30   , Dn4 
-	.byte	W12
-	.byte		MOD   , 6
-	.byte	W18
-	.byte		        0
-	.byte	W06
-	.byte		N06   , Cn4 
-	.byte	W12
-	.byte		        Dn4 
-	.byte	W12
-	.byte		        En4 
-	.byte	W12
-	.byte		N48   , Fs4 
-	.byte	W18
-	.byte		MOD   , 6
-	.byte	W06
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-mus_me_waza_2:
-	.byte	KEYSH , mus_me_waza_key+0
-	.byte	W12
-	.byte		VOICE , 73
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 90*mus_me_waza_mvl/mxv
-	.byte		N06   , Gn4 , v116
-	.byte	W12
-	.byte		        Dn4 
-	.byte	W06
-	.byte		        Gn4 
-	.byte	W06
-	.byte		N30   , Bn4 
-	.byte	W12
-	.byte		MOD   , 6
-	.byte	W18
-	.byte		        0
-	.byte	W06
-	.byte		N06   , An4 
-	.byte	W12
-	.byte		        Bn4 
-	.byte	W12
-	.byte		        Cn5 
-	.byte	W12
-	.byte		N48   , Dn5 
-	.byte	W18
-	.byte		MOD   , 6
-	.byte	W06
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-mus_me_waza_3:
-	.byte	KEYSH , mus_me_waza_key+0
-	.byte	W12
-	.byte		VOICE , 58
-	.byte		VOL   , 90*mus_me_waza_mvl/mxv
-	.byte		N12   , Gn1 , v120
-	.byte	W24
-	.byte		N12   
-	.byte	W24
-	.byte		        Fn1 
-	.byte	W24
-	.byte		N12   
-	.byte	W24
-	.byte		N48   , Dn1 
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  4 **********************@
-
-mus_me_waza_4:
-	.byte	KEYSH , mus_me_waza_key+0
-	.byte	W12
-	.byte		VOICE , 82
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 90*mus_me_waza_mvl/mxv
-	.byte		N12   , Dn3 , v056
-	.byte	W24
-	.byte		N12   
-	.byte	W12
-	.byte		N06   , Gn2 , v068
-	.byte	W06
-	.byte		        Bn2 
-	.byte	W06
-	.byte		N12   , Fn3 , v056
-	.byte	W24
-	.byte		N24   
-	.byte	W03
-	.byte		VOL   , 79*mus_me_waza_mvl/mxv
-	.byte	W03
-	.byte		        76*mus_me_waza_mvl/mxv
-	.byte	W02
-	.byte		        79*mus_me_waza_mvl/mxv
-	.byte	W04
-	.byte		        80*mus_me_waza_mvl/mxv
-	.byte	W02
-	.byte		        83*mus_me_waza_mvl/mxv
-	.byte	W03
-	.byte		        86*mus_me_waza_mvl/mxv
-	.byte	W03
-	.byte		        90*mus_me_waza_mvl/mxv
-	.byte	W04
-	.byte		N06   , An2 , v048
-	.byte	W06
-	.byte		        Dn3 
-	.byte	W06
-	.byte		        Fs3 
-	.byte	W06
-	.byte		        An3 
-	.byte	W06
-	.byte		N08   , Dn4 
-	.byte	W08
-	.byte		        Fs4 
-	.byte	W08
-	.byte		        An4 
-	.byte	W08
-	.byte		N06   , Dn5 
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  5 **********************@
-
-mus_me_waza_5:
-	.byte	KEYSH , mus_me_waza_key+0
-	.byte	W12
-	.byte		VOICE , 83
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		PAN   , c_v+48
-	.byte		VOL   , 90*mus_me_waza_mvl/mxv
-	.byte		N12   , Bn2 , v048
-	.byte	W24
-	.byte		N12   
-	.byte	W12
-	.byte		N06   , Dn2 , v056
-	.byte	W06
-	.byte		        Gn2 
-	.byte	W06
-	.byte		N12   , Cn3 , v048
-	.byte	W24
-	.byte		N24   
-	.byte	W03
-	.byte		VOL   , 79*mus_me_waza_mvl/mxv
-	.byte	W03
-	.byte		        76*mus_me_waza_mvl/mxv
-	.byte	W02
-	.byte		        79*mus_me_waza_mvl/mxv
-	.byte	W04
-	.byte		        80*mus_me_waza_mvl/mxv
-	.byte	W02
-	.byte		        83*mus_me_waza_mvl/mxv
-	.byte	W03
-	.byte		        86*mus_me_waza_mvl/mxv
-	.byte	W03
-	.byte		        90*mus_me_waza_mvl/mxv
-	.byte	W04
-	.byte		BEND  , c_v-2
-	.byte	W02
-	.byte		N06   , An2 , v024
-	.byte	W06
-	.byte		        Dn3 
-	.byte	W06
-	.byte		        Fs3 
-	.byte	W06
-	.byte		        An3 
-	.byte	W04
-	.byte	W02
-	.byte		N08   , Dn4 
-	.byte	W08
-	.byte		        Fs4 
-	.byte	W08
-	.byte		        An4 
-	.byte	W06
-	.byte	W02
-	.byte		N06   , Dn5 
-	.byte	W22
-	.byte	FINE
-
-@********************** Track  6 **********************@
-
-mus_me_waza_6:
-	.byte	KEYSH , mus_me_waza_key+0
-	.byte	W12
-	.byte		VOICE , 87
-	.byte		VOL   , 90*mus_me_waza_mvl/mxv
-	.byte		PAN   , c_v+48
-	.byte		N12   , Gn2 , v048
-	.byte	W24
-	.byte		N12   
-	.byte	W24
-	.byte		        Fn2 
-	.byte	W24
-	.byte		N12   
-	.byte	W24
-	.byte		N36   , Dn2 
-	.byte	W24
-	.byte	W12
-	.byte		N12   , Dn2 , v024
-	.byte	W12
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  7 **********************@
-
-mus_me_waza_7:
-	.byte	KEYSH , mus_me_waza_key+0
-	.byte	W12
-	.byte		VOICE , 0
-	.byte		VOL   , 90*mus_me_waza_mvl/mxv
-	.byte		N04   , En1 , v100
-	.byte	W12
-	.byte		N04   
-	.byte	W04
-	.byte		        En1 , v068
-	.byte	W04
-	.byte		N04   
-	.byte	W04
-	.byte		        En1 , v100
-	.byte	W12
-	.byte		N04   
-	.byte	W04
-	.byte		        En1 , v072
-	.byte	W04
-	.byte		N04   
-	.byte	W04
-	.byte		        En1 , v100
-	.byte	W12
-	.byte		N04   
-	.byte	W04
-	.byte		        En1 , v072
-	.byte	W04
-	.byte		N04   
-	.byte	W04
-	.byte		        En1 , v100
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W04
-	.byte		        En1 , v040
-	.byte	W04
-	.byte		N04   
-	.byte	W04
-	.byte		        En1 , v044
-	.byte	W04
-	.byte		N04   
-	.byte	W04
-	.byte		N04   
-	.byte	W04
-	.byte		        En1 , v072
-	.byte	W04
-	.byte		        En1 , v048
-	.byte	W04
-	.byte		        En1 , v056
-	.byte	W04
-	.byte		        En1 , v060
-	.byte	W04
-	.byte		        En1 , v064
-	.byte	W04
-	.byte		N05   , En1 , v068
-	.byte	W04
-	.byte	W02
-	.byte		        En1 , v104
-	.byte	W22
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-mus_me_waza:
-	.byte	7	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	mus_me_waza_pri	@ Priority
-	.byte	mus_me_waza_rev	@ Reverb.
-
-	.word	mus_me_waza_grp
-
-	.word	mus_me_waza_1
-	.word	mus_me_waza_2
-	.word	mus_me_waza_3
-	.word	mus_me_waza_4
-	.word	mus_me_waza_5
-	.word	mus_me_waza_6
-	.word	mus_me_waza_7
-
-	.end