From 899de63317d815b3d63120f6ddc37dc97fd4b759 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 14:06:50 -0400 Subject: [PATCH] Match mus_rg_masara.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_masara.mid | Bin 0 -> 5402 bytes sound/songs/mus_rg_masara.s | 1622 ---------------------------- 5 files changed, 5 insertions(+), 1624 deletions(-) create mode 100644 sound/songs/midi/mus_rg_masara.mid delete mode 100644 sound/songs/mus_rg_masara.s diff --git a/ld_script.txt b/ld_script.txt index 569c1d27fa..285353050b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -995,7 +995,7 @@ SECTIONS { sound/songs/mus_rg_vs_tore.o(.rodata); sound/songs/mus_rg_vs_yasei.o(.rodata); sound/songs/mus_rg_vs_last.o(.rodata); - sound/songs/mus_rg_masara.o(.rodata); + sound/songs/midi/mus_rg_masara.o(.rodata); sound/songs/midi/mus_rg_kenkyu.o(.rodata); sound/songs/mus_rg_ohkido.o(.rodata); sound/songs/mus_rg_pokecen.o(.rodata); diff --git a/songs.mk b/songs.mk index 22111ff317..f5df017f8c 100644 --- a/songs.mk +++ b/songs.mk @@ -408,6 +408,9 @@ $(MID_SUBDIR)/mus_rg_load02.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_load03.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G153 -V090 +$(MID_SUBDIR)/mus_rg_masara.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G159 -V100 + $(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 6953a732ee..8a7ddfe8e2 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -516,7 +516,7 @@ gSongTable:: @ 86B49F0 song mus_rg_vs_tore, 0, 0 @ Battle! Trainer song mus_rg_vs_yasei, 0, 0 @ Battle! Wild Pokémon song mus_rg_vs_last, 0, 0 @ Battle! Champion - song mus_rg_masara, 0, 0 @ Pallet Town + song mus_rg_masara, 0, 0 @ Pallet Town Theme (FRLG) song mus_rg_kenkyu, 0, 0 @ Professor Oak's Laboratory (FRLG) song mus_rg_ohkido, 0, 0 @ Professor Oak's Theme song mus_rg_pokecen, 0, 0 @ Pokémon Center diff --git a/sound/songs/midi/mus_rg_masara.mid b/sound/songs/midi/mus_rg_masara.mid new file mode 100644 index 0000000000000000000000000000000000000000..fa5917387054faea1b858675cb58b7f0d9a52811 GIT binary patch literal 5402 zcmbtXQBNG#6~3Fn_jbs%Mpmp$RLeo?+ALcmFt%I>1}|tg*eG$p28vveTq#ka#;Qhr z;wjj$y!9clyZ^%*hxeqd|3{jr@A(JLch0@v?CuooN`2vQ&OPTl-}&ynGqWGBfAOg? z#+s6GCjEH*Z(qW@Y+h{*4ZW5A%Dh^OhChE~UfI&0{w{xa%&SS`vxeR`-<>nh-$~5H zYi9T{0E`)S8Y<4yVGNFC@ChyE>a zyanCplMnl|o<8|7pFa1Ev(x7~ao^OxxK5wvjCjTVTxWmwWBzT-dAsj?aBj}UKIBcG z>x|Pc*53jC9pE#MKJ)2Q&zs1yyD<00A+-sf_z2_mGKPIA|&G)OO zJ6w~;1RfUhn8?h(aomr#D#^1gV~#dqH(@tmH((#aK7`##lV>}ykKjLo-G<%n^S3S~ z-BOeaMi;Po{TlMt;L{S1_?wmU-O|v6^whdl-nP%ClZcgHTKB-ZnsrsnLm<8G16z3A$7te9FPHf#>md$goF5g|bAYgeNNbf; zmADTJv?H8UROp1hV#d1PSvkC3Lp}3d_ZL0?p?563-C8V?bzRNVDV?+KkJkM)c6+*T zv_9f_=~mzh;%d1pLNCeOvF;B#q1X-U*|Uxi&jWw=Qgws-HpHUCJ>H~!KOr^ekd z$Bn)6KHmAqOR!6@^}Tc-?=8d=jW@CgHa@OriN=>RyT5Gg@jdwWkhcuGEcvj4!@Q*| zRXpbV_4IfNdD3SQb`iFQJbY^)?(-Y49>??G`aJUS4T1b5fw1ESl>W>qp!Z`7xCZJzqq~#{KYhiz#FY+nk7y0qL+=34HHp%s2{08DTUZWrTQ7_i95A~e^4!&W-e)se*^7H4x;+*?) zUtIV7%<%%&W#4@tJ%75tD~QWE;koiSvcFc(DdY70e#^a*etma$*!*+NyujNU*BAGF zc+TL#(VEDT7p1q8g9&3^luXi^c&z`oKvUy5YKWWGB;u2>Q?OI8*TeetPTQjhbwN-hX9#o_*ONCo&8a}xEgsa%X7AQC5 zE4Rva^ply7OwDQ-Wg0GyRspm?P6HB9IYo|!e6&hi90eol2&9CzN|E`eNTmHClcyDE zk`Hio9WwRtyB(w#KB@M*s&(aqs{=SHht`pwpRb(PS3^I@t$9~MzbnBn;*MwKgK_A< zttr-zhkE3kI?q^G9~;0=0`H`C6?*FoZ<`i+hj_|e>bTy!5pR{vzlO}W{%wX=+3@d8dp;{S@w9E@DcrwzfPa^vsv22(;7GyI5x+dLmY3LHZAjL z8DBu2@RTQlgJodrcROhL~ z;%(l?H&MRi!9L{cZ5rmRLO%(ng`?wA9%h1ua(XwEWVjK8?g8+>pX<;WBSo{j;Y{TLgPwu1sq-0aUIKh)P zuU|tRzUDi$#3TOZ?s?QrNKdU>MLs?nPs>+);k3CMAvX#%5k7T=kj6{Quq zO6*2s_pWuni4XB!6^d@sbUxB$<0|qyNR~(J;YV1OwG~xO(*+J)jT=uS?>*!xJYcMw zw4D!Y(cy>a*4T~DU}4eqeCOWXD6mR}MXxcOTZ#fMsyHX$t%4eXzjxiDokRKz- zr{(lLHR2OjiApvK(~npet3VWBX*WH@6ATC!l-b=adw3T