From c597ef4f735133cea7cdbb6617581e3d0b967a67 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 26 Sep 2018 18:46:33 -0400
Subject: [PATCH] Match mus_fanfa5.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 81cdb8921..8fae16bfa 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -854,7 +854,7 @@ SECTIONS {
         sound/songs/mus_me_asa.o(.rodata);
         sound/songs/mus_me_bachi.o(.rodata);
         sound/songs/midi/mus_fanfa4.o(.rodata);
-        sound/songs/mus_fanfa5.o(.rodata);
+        sound/songs/midi/mus_fanfa5.o(.rodata);
         sound/songs/mus_me_waza.o(.rodata);
         sound/songs/midi/mus_bijyutu.o(.rodata);
         sound/songs/midi/mus_dooro_x4.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 9a9ed9c28..ac46d7b67 100644
--- a/songs.mk
+++ b/songs.mk
@@ -153,6 +153,9 @@ $(MID_SUBDIR)/mus_fanfa1.s: %.s: %.mid
 $(MID_SUBDIR)/mus_fanfa4.s: %.s: %.mid
 	$(MID) $< $@ -G012 -R$(STD_REVERB) -P5
 
+$(MID_SUBDIR)/mus_fanfa5.s: %.s: %.mid
+	$(MID) $< $@ -G012 -R$(STD_REVERB) -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 b4631e4b0..957ed6ab7 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -375,7 +375,7 @@ gSongTable:: @ 86B49F0
 	song mus_me_asa, 2, 2           @ Pokémon Healed
 	song mus_me_bachi, 2, 2         @ Obtained a Badge!
 	song mus_fanfa4, 2, 2           @ Obtained an Item!
-	song mus_fanfa5, 2, 2           @ Your Pokémon Just Evolved!
+	song mus_fanfa5, 2, 2           @ Congratulations! Your Pokémon Evolved!
 	song mus_me_waza, 2, 2          @ Obtained a TM/HM!
 	song mus_bijyutu, 0, 0          @ Museum
 	song mus_dooro_x4, 0, 0         @ Introductions
diff --git a/sound/songs/midi/mus_fanfa5.mid b/sound/songs/midi/mus_fanfa5.mid
new file mode 100644
index 0000000000000000000000000000000000000000..96b3375d52900f41046be161991228faa15a121b
GIT binary patch
literal 1070
zcma)(zi-+=7=~Zy$yn$H4;@gOp#xGpM8qtJM2WmuswFECB}9r)hYlSqb+I~ii%p$w
zl?a$jRsRMIv~z#|Tl76*V@RsD)8p^G@4I{MeA4q@0?<%`j@n7@^($77vAhtXT+?Mn
zET28l9)(!$BWw8}zqB!}c2VhL==sL9;)qJU9C|2ERpb_tn?;UqgbpyYeJ!+69v+cL
zq(eHSOR{%(>WlCc;-BoYugks;k1A<T!VWMk;YH#2UVd#Oty;?Qy5}3|tz*<fIaLt{
z^Qe<Wo-fmqwi9^(m-r~Wlu*6rzKG5t?vWA^C9ZSked;($@hqfUQfKnp1!mlGv>V95
zF62Gd1AS13TGzRb(H^-+HUeYNfIe!HP0|X?fd#*~?@WI0VqP`Wea9VBf6Escdn9i&
zc1ahQ|7GoN@7UoC|5!e|u5IQv^JDUuJR}dv7TF@3WOF0W`)t#g^HJ37eCttW^2Zq#
z)qv(Ap?OU6gyu2L6W0_A<}vO6u%@r_qW89@c}#Q8Zr3!Ad3r*lnC1!1W11&4k7=IJ
zJf`_N&--jsE@-Z17hC2}<<EV5s`P7>etTkF>Q@%9W{Y(T#-vGd*GVJLuNoV)E+zXT
zQT)P>@)z)#|LDdHaPUUFGx0Dh)wj4YpWk7iYFXr~S{#5o{9kL<r%qH`<#QWc<&mW2
EZ|TwhXaE2J

literal 0
HcmV?d00001

diff --git a/sound/songs/mus_fanfa5.s b/sound/songs/mus_fanfa5.s
deleted file mode 100644
index dab916a84..000000000
--- a/sound/songs/mus_fanfa5.s
+++ /dev/null
@@ -1,350 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	mus_fanfa5_grp, voicegroup012
-	.equ	mus_fanfa5_pri, 5
-	.equ	mus_fanfa5_rev, reverb_set+50
-	.equ	mus_fanfa5_mvl, 127
-	.equ	mus_fanfa5_key, 0
-	.equ	mus_fanfa5_tbs, 1
-	.equ	mus_fanfa5_exg, 0
-	.equ	mus_fanfa5_cmp, 1
-
-	.section .rodata
-	.global	mus_fanfa5
-	.align	2
-
-@********************** Track  1 **********************@
-
-mus_fanfa5_1:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte	TEMPO , 150*mus_fanfa5_tbs/2
-	.byte		VOICE , 56
-	.byte		PAN   , c_v+18
-	.byte		VOL   , 90*mus_fanfa5_mvl/mxv
-	.byte		N22   , Ds4 , v104
-	.byte	W16
-	.byte		VOL   , 68*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        36*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        90*mus_fanfa5_mvl/mxv
-	.byte		N22   , Cn4 
-	.byte	W16
-	.byte		VOL   , 68*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        36*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        90*mus_fanfa5_mvl/mxv
-	.byte		N16   , Gs3 
-	.byte	W16
-	.byte		N06   , Ds3 
-	.byte	W08
-	.byte		        Cn3 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		N04   , Fs4 
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		        As4 
-	.byte	W08
-	.byte		N48   , Gs4 
-	.byte	W16
-	.byte		MOD   , 6
-	.byte	W32
-	.byte		        0
-	.byte	W96
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-mus_fanfa5_2:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte		VOICE , 56
-	.byte		PAN   , c_v-16
-	.byte		VOL   , 90*mus_fanfa5_mvl/mxv
-	.byte		N22   , Cn5 , v104
-	.byte	W16
-	.byte		VOL   , 68*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        36*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        90*mus_fanfa5_mvl/mxv
-	.byte		N22   , Gs4 
-	.byte	W16
-	.byte		VOL   , 68*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        36*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        90*mus_fanfa5_mvl/mxv
-	.byte		N40   , Ds4 
-	.byte	W12
-	.byte		MOD   , 6
-	.byte	W28
-	.byte		VOL   , 68*mus_fanfa5_mvl/mxv
-	.byte		MOD   , 0
-	.byte	W04
-	.byte		VOL   , 36*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		        90*mus_fanfa5_mvl/mxv
-	.byte		N04   , Cs5 
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		        As4 
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		        Cs5 
-	.byte	W08
-	.byte		N48   , Cn5 
-	.byte	W16
-	.byte		MOD   , 6
-	.byte	W32
-	.byte		        0
-	.byte	W96
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-mus_fanfa5_3:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte		VOICE , 88
-	.byte		VOL   , 90*mus_fanfa5_mvl/mxv
-	.byte		N12   , Ds1 , v112
-	.byte	W24
-	.byte		N12   
-	.byte	W24
-	.byte		N12   
-	.byte	W24
-	.byte		N08   , Cn1 
-	.byte	W08
-	.byte		        Ds1 
-	.byte	W08
-	.byte		        Gs1 
-	.byte	W08
-	.byte		N16   , As1 
-	.byte	W24
-	.byte		        Cs2 
-	.byte	W24
-	.byte		N40   , Cn2 
-	.byte	W48
-	.byte	W96
-	.byte	FINE
-
-@********************** Track  4 **********************@
-
-mus_fanfa5_4:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte		VOICE , 82
-	.byte		PAN   , c_v-48
-	.byte		VOL   , 90*mus_fanfa5_mvl/mxv
-	.byte		N08   , Gs4 , v040
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		VOL   , 90*mus_fanfa5_mvl/mxv
-	.byte		N08   , Gs4 
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		        Ds3 
-	.byte	W08
-	.byte		        Cs3 
-	.byte	W08
-	.byte		        As2 
-	.byte	W08
-	.byte		        Fs2 
-	.byte	W08
-	.byte		        Cs2 
-	.byte	W08
-	.byte		        As2 
-	.byte	W08
-	.byte		        Cs3 
-	.byte	W08
-	.byte		N48   , Ds3 
-	.byte	W16
-	.byte		MOD   , 6
-	.byte	W32
-	.byte		        0
-	.byte	W96
-	.byte	FINE
-
-@********************** Track  5 **********************@
-
-mus_fanfa5_5:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte		VOICE , 83
-	.byte		PAN   , c_v+48
-	.byte		VOL   , 90*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		N08   , Gs4 , v040
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W04
-	.byte		VOL   , 90*mus_fanfa5_mvl/mxv
-	.byte	W04
-	.byte		N08   , Gs4 
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		        Ds3 
-	.byte	W04
-	.byte	W04
-	.byte		        Cs3 
-	.byte	W08
-	.byte		        As2 
-	.byte	W08
-	.byte		        Fs2 
-	.byte	W08
-	.byte		        Cs2 
-	.byte	W08
-	.byte		        As2 
-	.byte	W08
-	.byte		        Cs3 
-	.byte	W08
-	.byte		N44   , Ds3 
-	.byte	W12
-	.byte		MOD   , 6
-	.byte	W32
-	.byte		        0
-	.byte	W96
-	.byte	FINE
-
-@********************** Track  6 **********************@
-
-mus_fanfa5_6:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte		VOICE , 47
-	.byte		VOL   , 90*mus_fanfa5_mvl/mxv
-	.byte	W24
-	.byte		        90*mus_fanfa5_mvl/mxv
-	.byte	W56
-	.byte		N08   , Cn2 , v127
-	.byte	W08
-	.byte		N08   
-	.byte	W08
-	.byte		        Fs2 
-	.byte	W24
-	.byte		        Cs2 
-	.byte	W08
-	.byte		        As1 , v112
-	.byte	W08
-	.byte		N08   
-	.byte	W08
-	.byte		N12   , Cn2 , v127
-	.byte	W48
-	.byte	W96
-	.byte	FINE
-
-@********************** Track  7 **********************@
-
-mus_fanfa5_7:
-	.byte	KEYSH , mus_fanfa5_key+0
-	.byte	W12
-	.byte		VOICE , 0
-	.byte		VOL   , 90*mus_fanfa5_mvl/mxv
-	.byte		N04   , En1 , v112
-	.byte		N80   , An2 , v120
-	.byte	W24
-	.byte		VOL   , 90*mus_fanfa5_mvl/mxv
-	.byte		N04   , En1 , v112
-	.byte	W08
-	.byte		        En1 , v092
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		        En1 , v112
-	.byte	W16
-	.byte		        En1 , v092
-	.byte	W08
-	.byte		        En1 , v112
-	.byte	W08
-	.byte		        En1 , v092
-	.byte	W08
-	.byte		N04   
-	.byte	W08
-	.byte		        En1 , v112
-	.byte	W16
-	.byte		        En1 , v092
-	.byte	W08
-	.byte		        En1 , v112
-	.byte	W08
-	.byte		        En1 , v092
-	.byte	W04
-	.byte		        En1 , v112
-	.byte	W04
-	.byte		        En1 , v092
-	.byte	W04
-	.byte		N04   
-	.byte	W04
-	.byte		        En1 , v112
-	.byte	W48
-	.byte	W96
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-mus_fanfa5:
-	.byte	7	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	mus_fanfa5_pri	@ Priority
-	.byte	mus_fanfa5_rev	@ Reverb.
-
-	.word	mus_fanfa5_grp
-
-	.word	mus_fanfa5_1
-	.word	mus_fanfa5_2
-	.word	mus_fanfa5_3
-	.word	mus_fanfa5_4
-	.word	mus_fanfa5_5
-	.word	mus_fanfa5_6
-	.word	mus_fanfa5_7
-
-	.end