Match mus_rg_fan2.mid

5 files changed, 5 insertions, 375 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 42cb6fbcc..6eb9f8920 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -1012,7 +1012,7 @@ SECTIONS {
         sound/songs/mus_rg_nibi.o(.rodata);
         sound/songs/mus_rg_rival1.o(.rodata);
         sound/songs/mus_rg_rival2.o(.rodata);
-        sound/songs/mus_rg_fan2.o(.rodata);
+        sound/songs/midi/mus_rg_fan2.o(.rodata);
         sound/songs/mus_rg_fan5.o(.rodata);
         sound/songs/mus_rg_fan6.o(.rodata);
         sound/songs/midi/mus_me_rg_photo.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 0076d7c7d..e907bc222 100644
--- a/songs.mk
+++ b/songs.mk
@@ -363,6 +363,9 @@ $(MID_SUBDIR)/mus_rg_ending.s: %.s: %.mid
 $(MID_SUBDIR)/mus_rg_exeye.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G144 -V090
 
+$(MID_SUBDIR)/mus_rg_fan2.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G175 -V070 -P5
+
 $(MID_SUBDIR)/mus_ropeway.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G071 -V078
 
diff --git a/sound/song_table.inc b/sound/song_table.inc
index ae2d590f3..1505f6700 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -533,7 +533,7 @@ gSongTable:: @ 86B49F0
 	song mus_rg_nibi, 0, 0          @ Viridian/Saffron/Pewter City
 	song mus_rg_rival1, 0, 0        @ Encounter! Rival
 	song mus_rg_rival2, 0, 0        @ Rival's Exit
-	song mus_rg_fan2, 2, 2          @ Fanfare 2
+	song mus_rg_fan2, 2, 2          @ Fanfare: Professor Oak's Evaluation (FRLG)
 	song mus_rg_fan5, 2, 2          @ Obtained a Starter!
 	song mus_rg_fan6, 2, 2          @ Pokémon Caught! (Used in Emerald)
 	song mus_me_rg_photo, 2, 2      @ Pokémon Printer (FRLG)
diff --git a/sound/songs/midi/mus_rg_fan2.mid b/sound/songs/midi/mus_rg_fan2.mid
new file mode 100644
index 000000000..98300bce1
--- /dev/null
+++ b/sound/songs/midi/mus_rg_fan2.mid
diff --git a/sound/songs/mus_rg_fan2.s b/sound/songs/mus_rg_fan2.s
deleted file mode 100644
index 7c49dfc95..000000000
--- a/sound/songs/mus_rg_fan2.s
+++ /dev/null
@@ -1,373 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	mus_rg_fan2_grp, voicegroup175
-	.equ	mus_rg_fan2_pri, 5
-	.equ	mus_rg_fan2_rev, reverb_set+50
-	.equ	mus_rg_fan2_mvl, 127
-	.equ	mus_rg_fan2_key, 0
-	.equ	mus_rg_fan2_tbs, 1
-	.equ	mus_rg_fan2_exg, 0
-	.equ	mus_rg_fan2_cmp, 1
-
-	.section .rodata
-	.global	mus_rg_fan2
-	.align	2
-
-@********************** Track  1 **********************@
-
-mus_rg_fan2_1:
-	.byte	KEYSH , mus_rg_fan2_key+0
-	.byte	TEMPO , 64*mus_rg_fan2_tbs/2
-	.byte		VOICE , 80
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 50*mus_rg_fan2_mvl/mxv
-	.byte	W12
-	.byte	TEMPO , 74*mus_rg_fan2_tbs/2
-	.byte		N02   , An3 , v127
-	.byte	W02
-	.byte		        An3 , v064
-	.byte	W03
-	.byte		        An3 , v127
-	.byte	W02
-	.byte		        An3 , v068
-	.byte	W03
-	.byte		        Gn3 , v127
-	.byte	W02
-	.byte		        Gn3 , v064
-	.byte	W03
-	.byte		        Gn3 , v127
-	.byte	W02
-	.byte		        Gn3 , v064
-	.byte	W03
-	.byte		        Fn3 , v127
-	.byte	W02
-	.byte		        Fn3 , v064
-	.byte	W02
-	.byte	W01
-	.byte		        En3 , v127
-	.byte	W02
-	.byte		        En3 , v064
-	.byte	W03
-	.byte		        Fn3 , v127
-	.byte	W02
-	.byte		        Fn3 , v064
-	.byte	W03
-	.byte		        An3 , v127
-	.byte	W01
-	.byte	W01
-	.byte		        An3 , v064
-	.byte	W03
-	.byte		N05   , Cn4 , v127
-	.byte	W05
-	.byte		N04   , Cn4 , v064
-	.byte	W03
-	.byte	W02
-	.byte		N05   , En4 , v127
-	.byte	W05
-	.byte		N04   , En4 , v064
-	.byte	W05
-	.byte		        Fn3 , v127
-	.byte	W05
-	.byte		        Fn3 , v064
-	.byte	W04
-	.byte		N02   , Fn3 , v044
-	.byte	W03
-	.byte	W12
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-mus_rg_fan2_2:
-	.byte	KEYSH , mus_rg_fan2_key+0
-	.byte		VOICE , 81
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 40*mus_rg_fan2_mvl/mxv
-	.byte		PAN   , c_v-64
-	.byte		BEND  , c_v+1
-	.byte	W09
-	.byte		PAN   , c_v+62
-	.byte	W03
-	.byte		N05   , Fn5 , v080
-	.byte	W04
-	.byte		PAN   , c_v-64
-	.byte	W01
-	.byte		N02   , En5 
-	.byte	W05
-	.byte		N05   , Dn5 
-	.byte	W02
-	.byte	W03
-	.byte		N02   , Cn5 
-	.byte	W05
-	.byte		N05   , As4 
-	.byte	W04
-	.byte	W01
-	.byte		        Cn5 
-	.byte	W01
-	.byte		PAN   , c_v+63
-	.byte	W04
-	.byte		N05   , Dn5 
-	.byte	W05
-	.byte		        En5 
-	.byte	W01
-	.byte		PAN   , c_v-64
-	.byte	W04
-	.byte		N10   , Fn5 
-	.byte	W08
-	.byte		PAN   , c_v+63
-	.byte	W02
-	.byte		N10   , Gn5 
-	.byte	W10
-	.byte		N09   , Fn5 , v064
-	.byte	W09
-	.byte		N02   , Fn5 , v028
-	.byte	W03
-	.byte	W12
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-mus_rg_fan2_3:
-	.byte	KEYSH , mus_rg_fan2_key+0
-	.byte		VOICE , 87
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 44*mus_rg_fan2_mvl/mxv
-	.byte	W12
-	.byte		N02   , Cn5 , v127
-	.byte	W05
-	.byte		N05   , Fn4 
-	.byte	W05
-	.byte		N02   , Cn5 
-	.byte	W02
-	.byte	W03
-	.byte		        As4 
-	.byte	W05
-	.byte		        An4 
-	.byte	W04
-	.byte	W01
-	.byte		        Gn4 
-	.byte	W05
-	.byte		        Fn4 
-	.byte	W05
-	.byte		        En4 
-	.byte	W01
-	.byte	W12
-	.byte	W02
-	.byte		        Cn5 
-	.byte	W10
-	.byte		N05   , Fn4 
-	.byte	W12
-	.byte	W12
-	.byte	FINE
-
-@********************** Track  4 **********************@
-
-mus_rg_fan2_4:
-	.byte	KEYSH , mus_rg_fan2_key+0
-	.byte		VOICE , 13
-	.byte		BENDR , 12
-	.byte		LFOS  , 44
-	.byte		PAN   , c_v-32
-	.byte		VOL   , 51*mus_rg_fan2_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v+32
-	.byte	W05
-	.byte		        c_v-32
-	.byte	W04
-	.byte		N02   , Cn5 , v120
-	.byte	W01
-	.byte		PAN   , c_v+32
-	.byte	W04
-	.byte		N02   , Fn5 
-	.byte	W02
-	.byte		PAN   , c_v-32
-	.byte	W03
-	.byte		N02   , An4 
-	.byte	W02
-	.byte		PAN   , c_v+32
-	.byte	W03
-	.byte		N02   , Cn5 
-	.byte	W02
-	.byte		PAN   , c_v-32
-	.byte	W03
-	.byte		N02   , Fn4 
-	.byte	W01
-	.byte		PAN   , c_v+32
-	.byte	W03
-	.byte	W01
-	.byte		N02   , An4 
-	.byte	W01
-	.byte		PAN   , c_v-33
-	.byte	W04
-	.byte		N02   , Cn4 
-	.byte	W05
-	.byte		PAN   , c_v-1
-	.byte		N02   , Fn4 , v112
-	.byte	W01
-	.byte	W04
-	.byte		        An4 , v120
-	.byte	W08
-	.byte	W02
-	.byte		        Cn5 
-	.byte	W10
-	.byte		        Fn5 
-	.byte	W02
-	.byte		        Fn5 , v064
-	.byte	W03
-	.byte		        Fn5 , v036
-	.byte	W03
-	.byte		        Fn5 , v024
-	.byte	W04
-	.byte	W12
-	.byte	FINE
-
-@********************** Track  5 **********************@
-
-mus_rg_fan2_5:
-	.byte	KEYSH , mus_rg_fan2_key+0
-	.byte		VOICE , 24
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		PAN   , c_v-32
-	.byte		VOL   , 44*mus_rg_fan2_mvl/mxv
-	.byte		BEND  , c_v+1
-	.byte	W12
-	.byte		N05   , Fn5 , v080
-	.byte	W05
-	.byte		N02   , En5 
-	.byte	W05
-	.byte		N05   , Dn5 
-	.byte	W02
-	.byte	W03
-	.byte		N02   , Cn5 
-	.byte	W05
-	.byte		N05   , As4 
-	.byte	W04
-	.byte	W01
-	.byte		        Cn5 
-	.byte	W05
-	.byte		        Dn5 
-	.byte	W05
-	.byte		        En5 
-	.byte	W01
-	.byte	W04
-	.byte		        Fn5 
-	.byte	W08
-	.byte	W02
-	.byte		        Gn5 
-	.byte	W10
-	.byte		N09   , Fn5 
-	.byte	W09
-	.byte		N02   , Fn5 , v044
-	.byte	W03
-	.byte		        Fn5 , v024
-	.byte	W12
-	.byte	FINE
-
-@********************** Track  6 **********************@
-
-mus_rg_fan2_6:
-	.byte	KEYSH , mus_rg_fan2_key+0
-	.byte		VOICE , 24
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+16
-	.byte		VOL   , 65*mus_rg_fan2_mvl/mxv
-	.byte	W12
-	.byte		N05   , Fn5 , v127
-	.byte	W05
-	.byte		N02   , En5 
-	.byte	W05
-	.byte		N05   , Dn5 
-	.byte	W02
-	.byte	W03
-	.byte		N02   , Cn5 
-	.byte	W05
-	.byte		N05   , As4 
-	.byte	W04
-	.byte	W01
-	.byte		        Cn5 
-	.byte	W05
-	.byte		        Dn5 
-	.byte	W05
-	.byte		        En5 
-	.byte	W01
-	.byte	W04
-	.byte		        Fn5 
-	.byte	W08
-	.byte	W02
-	.byte		        Gn5 
-	.byte	W10
-	.byte		N09   , Fn5 
-	.byte	W09
-	.byte		N02   , Fn5 , v064
-	.byte	W03
-	.byte		        Fn5 , v028
-	.byte	W12
-	.byte	FINE
-
-@********************** Track  7 **********************@
-
-mus_rg_fan2_7:
-	.byte	KEYSH , mus_rg_fan2_key+0
-	.byte		VOICE , 0
-	.byte		VOL   , 70*mus_rg_fan2_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W12
-	.byte		N04   , Fs2 , v084
-	.byte	W04
-	.byte		        Fs2 , v064
-	.byte	W05
-	.byte		        Fs2 , v084
-	.byte	W03
-	.byte	W02
-	.byte		        Fs2 , v064
-	.byte	W05
-	.byte		        Fs2 , v080
-	.byte	W05
-	.byte		        Fs2 , v064
-	.byte	W04
-	.byte		PAN   , c_v+48
-	.byte		N04   , Fs2 , v072
-	.byte	W05
-	.byte		N02   , Fs2 , v044
-	.byte	W03
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W02
-	.byte		N09   , Bn4 
-	.byte	W08
-	.byte		PAN   , c_v-48
-	.byte	W02
-	.byte		N09   , Bn4 , v072
-	.byte	W10
-	.byte		N12   , Bn4 , v044
-	.byte	W12
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-mus_rg_fan2:
-	.byte	7	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	mus_rg_fan2_pri	@ Priority
-	.byte	mus_rg_fan2_rev	@ Reverb.
-
-	.word	mus_rg_fan2_grp
-
-	.word	mus_rg_fan2_1
-	.word	mus_rg_fan2_2
-	.word	mus_rg_fan2_3
-	.word	mus_rg_fan2_4
-	.word	mus_rg_fan2_5
-	.word	mus_rg_fan2_6
-	.word	mus_rg_fan2_7
-
-	.end