From 54d48abcd2bf2a08ed895be123c3a6366adfd062 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 00:49:32 -0400 Subject: [PATCH] Match mus_rg_fan6.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_fan6.mid | Bin 0 -> 1858 bytes sound/songs/mus_rg_fan6.s | 602 ------------------------------- 5 files changed, 5 insertions(+), 604 deletions(-) create mode 100644 sound/songs/midi/mus_rg_fan6.mid delete mode 100644 sound/songs/mus_rg_fan6.s diff --git a/ld_script.txt b/ld_script.txt index 6d491802c..9bed339e7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1014,7 +1014,7 @@ SECTIONS { sound/songs/mus_rg_rival2.o(.rodata); sound/songs/midi/mus_rg_fan2.o(.rodata); sound/songs/midi/mus_rg_fan5.o(.rodata); - sound/songs/mus_rg_fan6.o(.rodata); + sound/songs/midi/mus_rg_fan6.o(.rodata); sound/songs/midi/mus_me_rg_photo.o(.rodata); sound/songs/mus_rg_titlerog.o(.rodata); sound/songs/mus_rg_get_yasei.o(.rodata); diff --git a/songs.mk b/songs.mk index 614527e59..bba9a5243 100644 --- a/songs.mk +++ b/songs.mk @@ -369,6 +369,9 @@ $(MID_SUBDIR)/mus_rg_fan2.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_fan5.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G178 -V077 -P5 +$(MID_SUBDIR)/mus_rg_fan6.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G179 -V094 -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 c0132f756..45e816275 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -535,7 +535,7 @@ gSongTable:: @ 86B49F0 song mus_rg_rival2, 0, 0 @ Rival's Exit song mus_rg_fan2, 2, 2 @ Fanfare: Professor Oak's Evaluation (FRLG) song mus_rg_fan5, 2, 2 @ Fanfare: Pokémon Obtained (FRLG) - song mus_rg_fan6, 2, 2 @ Pokémon Caught! (Used in Emerald) + song mus_rg_fan6, 2, 2 @ Fanfare: Pokémon Caught song mus_me_rg_photo, 2, 2 @ Pokémon Printer (FRLG) song mus_rg_titlerog, 0, 0 @ Game Freak song mus_rg_get_yasei, 0, 0 @ Pokémon Caught Victory Theme diff --git a/sound/songs/midi/mus_rg_fan6.mid b/sound/songs/midi/mus_rg_fan6.mid new file mode 100644 index 0000000000000000000000000000000000000000..d2bc1feb304d137d7a61216805ec5dfb194c3105 GIT binary patch literal 1858 zcma)+-D(?G6ouD#JF^=x)WxL5lv0Wjj;zSB5=7%rLnp3W#Yk~R$Pm#QIv2ihDKw!_ zA}D1Nt5I()TUK7fe|0W;)BnChuiA#bKwrRJ=gf(JgebXM`Gw6TcjEQ1bXW<uQ1=}5_!oe*=UtqJ+oe=-*7eO z^gQqCBsOcYzpFXXym%L&S4B&rbE5O2WznkWJ<)jVQ4QGjxKoWM)i8eiqI2(E{5Xd_ z*Li}>Rs4l8=tha`dA>Z3fIa%UQOP%PH)`2uWTyjMb3UGDeKq9b1T5Z=?g>687??=I~<@qFk9qBYTvMb|{{i+&}V zjHjI!%?u<%EJL>LQtv|cbqaRB$mT;!frf!b!3JLijT5JZ?BeGL2b^Bkk_n+n@SKHg z&&C(qvykmlEbS6?mTGt=_76ONygdUPu)ys??6(W>Pu2^}D=;q~`_J*AwDSP>Gi+kn zzD&IgIbea?xrCY*Er=FHZ-8T?w?uD?u84jl`ibbLq7QkIK|6;Lp7+K{-QF~QspBxc zKvQ=d^eTz}4KMD{8%3{DvT?7{67!7g^gJK3hhCXJeuUOnrjK#2%si{~4Poo6(Z`Xr zK8~x2dmPtP=^Mh<=jwdv8ud-?o5-QQEjlUePP3v@Vy5qg==-9JqLJt-=WZ-5$P|(@ z1)YAc_yfO=;JZu=ZQ>t(sXJ`@30vD?%c-`+vC{z#na_XPPRM+#Tu<5Q0JF^}y!su! zid4CtveN-xWd0)a7nyIB>nS@O;Br!Ay{Dt>mGK*Jr1v?;K|h-Woh;DL#{M~-S`9i= z@cY@?i|0f0jx<64deiS*=N>cb7dkWW`d1$Koh#&N>a;m3MnBiW&6eNE@o_GcREtjk zpO19y#B-#dGfsV`gMO}Q_c+oo8PB=+;hE=OGoF{uO~4+#j^et_Dw;xWV`kM7Kht!( z5YrEEEwY8CrHeN0*o5}4&!evaC!ZH4@w