From e951c5f2218af42805ba94ddadb3aacf1e1a5e08 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 20:23:06 -0400 Subject: [PATCH] Match mus_rg_rival2.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_rival2.mid | Bin 0 -> 5234 bytes sound/songs/mus_rg_rival2.s | 1436 ---------------------------- 5 files changed, 5 insertions(+), 1438 deletions(-) create mode 100644 sound/songs/midi/mus_rg_rival2.mid delete mode 100644 sound/songs/mus_rg_rival2.s diff --git a/ld_script.txt b/ld_script.txt index 5e3191cd2..8cbac2194 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1011,7 +1011,7 @@ SECTIONS { sound/songs/midi/mus_rg_kuchiba.o(.rodata); sound/songs/midi/mus_rg_nibi.o(.rodata); sound/songs/midi/mus_rg_rival1.o(.rodata); - sound/songs/mus_rg_rival2.o(.rodata); + sound/songs/midi/mus_rg_rival2.o(.rodata); sound/songs/midi/mus_rg_fan2.o(.rodata); sound/songs/midi/mus_rg_fan5.o(.rodata); sound/songs/midi/mus_rg_fan6.o(.rodata); diff --git a/songs.mk b/songs.mk index 727a9fb1c..8d241f265 100644 --- a/songs.mk +++ b/songs.mk @@ -471,6 +471,9 @@ $(MID_SUBDIR)/mus_rg_purin.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_rival1.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G174 -V079 +$(MID_SUBDIR)/mus_rg_rival2.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G174 -V079 + $(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 1a91492b2..3b3d82762 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -532,7 +532,7 @@ gSongTable:: @ 86B49F0 song mus_rg_kuchiba, 0, 0 @ Vermillion City Theme (FRLG) song mus_rg_nibi, 0, 0 @ Pewter City Theme (FRLG) song mus_rg_rival1, 0, 0 @ A Rival Appears (FRLG) - song mus_rg_rival2, 0, 0 @ Rival's Exit + song mus_rg_rival2, 0, 0 @ A Rival Appears (No Intro) (FRLG) 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 @ Fanfare: Pokémon Caught diff --git a/sound/songs/midi/mus_rg_rival2.mid b/sound/songs/midi/mus_rg_rival2.mid new file mode 100644 index 0000000000000000000000000000000000000000..cae821245050e46017ec7c09888e1366f8b1165a GIT binary patch literal 5234 zcmcJRU2hxL5r&6e`7k23Fd)>$7AORvW+cnDELv8~DiLTpOl;bbY)K}B+DZTh5DEtk zQXu_+E{d!vmTH?TQ7mcy3`uU&Ui89A+oZq4K!1n(oUdJyRRkeTZa6!0-kEu4=5TkG zYmYWXL`g<+5-rz0{yEyXy!`3N$f@WRdAS;#{^bwqFI8sakHYVJ@^V%z>eO?2o{{~t zm*o4QWZ#$Egk*2aZmAkPF3DLh_j9L4pRdV&c0JgAI}RVeEwWodR*+8D$2rtnarF2W z@+QYO&2cmUuX0|+euwir67A<={T%TuySK63Mpls;a|@|sd7mZpC3KHZaW<#bi3#Q& zG4BbS%KACf&%1Y#cabj6^A$_kQsEgY4zi!iB$YXenl6}A3C33r9cAcOx0In>B27tS zO=;RM+;uix8nFk<^R05_n%u556Jwcp%Q_y^UDu60!C+s8!?LK|caZNOt4Q6#n{d)& zsG#d~AJ^8?S_o`jh?)-4wW- zFqVmXT&#L}kEi7Gj2zf|%*?sO?MgjpRODK~+qZ|J;p4Hdmi2T*YICOEy26omJVA%B}_3kD~0a3~3#Zw?msN(Wt_04X(O2UyJYIy*Lk-#sBFASAbDO zZAOp8uWWmC2dQVUURH1$Z*L$sM719vA0XGuBbGB#_ih!rio9F4Gg!r6>%;Mno^5(v zf=}g(j2!mA_FhO?_9}6(&6PRK)%%_&{PUu}(e2lDKtLRr zXC}1w1_|E~)#ogGi`W*mt*!$aBHoq|y}G5gui{@sYT`*8d=`nnD3F*igbazRDtA4| zEva1H;B{=9J|w;DE#R`?=v^cIHF~gsT#zwCW6);lTHBbzS-OKbe4#LC8^rnE+FUm7 zJY44CWXlLm{z02Xo6UX2Trt7os)z@2y3<*2;grvDp1OJCrBmw!ykGxq{7 zNH$*VT#m!$Ws%Mdat3(`c?o$j4xeSRQS+k6Gwxky(&%Ax(&=+?(43Re&RndJ(kUPd z$P4&iu>SZ)IzDks4ikr-G`apA?m&|}(7B4_Z-IYg{4W#dvM857O!61WS0rDNbL+2+ z|1AEq#y`YA>P)$OQ;sKklV{CebMNGld7~?Ih5dN>b#?lF4g0@J{8x{OKgYT5*A?Uy zr0tu6mx7n-r1j{2s^ol@`e&)1x#*sNvw8tt*X{e~{fFmzk^X8w--l^8-)YyU3!JBO z6Xt5?o8qG;*u?JV>~Y_1{11{lEK~B&Rr#}BKmJr%34X`7WJrGcy#$`wmw&x0f5{dl zSzG=iHx|2myjpw|yL?nzEFE1IlNO6fm&K&TlF@gbcju8i4>^w#93N+cXAx=fvF@@s zv{*2@EFvvFrr`W}-knG8Jmfq|a4ZZ4pZZ&UJ+8M{D7q{iMm{V@EtU=R(CFUJ>ILEz zOdOVo7E45zCBo$OJbbU|k z{>0Aib#Zq2Ec+3@v0RC*yMyz$!$THaP-o?1Iuu9sW@F(yx5N9THv^jYV{aPC|G+_g zDrLQekGm$y3knW$Ew0uGNO!eS7h4vbC1-{IbxoxT4{0q+|MD^hv#GQ9_QzU4()Wlsr@|p&Xeyv`Lv`K zUGb!hQ(Q8wIZV7#d$Y)+Mupdu@#5W~+yFg?F?Ux|-QKm7gVo_c2+hIY#lhN!Yxerd zG&sXcPi+s`|_Fl0A){0t61 ze|{o7eg@a)zv$u*#PvAhmxuEEd=veCXC03|>FfA^>+|`2eO~wRkLBa*L>e6Y>Y6vY zkK_GUoPD^j-u|Jh*W=%Ey5V)^TZ&7Zfw=VF*E!+%Ejj6RFW)`t{Dahg-klr%!+k;b z=RTjW)87wo_qY?qq2J%g4?f>Y{$D5mK6xnr{zU$!|9u;c&8Hii;U6|6e7f