From 74f53b37789a25ba0f5249be15f4295ecfe1788c Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 01:21:51 -0400 Subject: [PATCH] Match mus_rg_load01.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_load01.mid | Bin 0 -> 6879 bytes sound/songs/mus_rg_load01.s | 2024 ---------------------------- 5 files changed, 5 insertions(+), 2026 deletions(-) create mode 100644 sound/songs/midi/mus_rg_load01.mid delete mode 100644 sound/songs/mus_rg_load01.s diff --git a/ld_script.txt b/ld_script.txt index bdddd7143f..1983648904 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -986,7 +986,7 @@ SECTIONS { sound/songs/mus_rg_otsukimi.o(.rodata); sound/songs/mus_rg_pokeyashi.o(.rodata); sound/songs/midi/mus_rg_ending.o(.rodata); - sound/songs/mus_rg_load01.o(.rodata); + sound/songs/midi/mus_rg_load01.o(.rodata); sound/songs/mus_rg_opening.o(.rodata); sound/songs/mus_rg_load02.o(.rodata); sound/songs/mus_rg_load03.o(.rodata); diff --git a/songs.mk b/songs.mk index 3550dc373e..50bcb96ba2 100644 --- a/songs.mk +++ b/songs.mk @@ -399,6 +399,9 @@ $(MID_SUBDIR)/mus_rg_kinomikui.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_kuchiba.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G172 -V090 +$(MID_SUBDIR)/mus_rg_load01.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G150 -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 59f628cbbc..e6ea0e254e 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -507,7 +507,7 @@ gSongTable:: @ 86B49F0 song mus_rg_otsukimi, 0, 0 @ Mt. Moon song mus_rg_pokeyashi, 0, 0 @ Pokémon Mansion song mus_rg_ending, 0, 0 @ Ending Theme (FRLG) - song mus_rg_load01, 0, 0 @ Route 1 + song mus_rg_load01, 0, 0 @ Road to Viridian City: Leaving Pallet Town (FRLG) song mus_rg_opening, 0, 0 @ Route 24/Intro song mus_rg_load02, 0, 0 @ Route 3 song mus_rg_load03, 0, 0 @ Route 11 diff --git a/sound/songs/midi/mus_rg_load01.mid b/sound/songs/midi/mus_rg_load01.mid new file mode 100644 index 0000000000000000000000000000000000000000..9d0ebcde630c302473cea1cd5518ae8cb8939bff GIT binary patch literal 6879 zcmdT|OK)366h3CsnT~Z)kkyJvK!s365v5JrO;xG{%a&_h%e7;iSb+v9i!6euP+)DW}cZlO@}R^o_rc4Lz%ntH66;_dvrKYHd=f{Kjr9t{(Vx_AV2kwhHUV6^tvWGh|J@3hGr{JsYoGo;LF# z=EJGxDZ%$Rmd7N#G~V$V;ghvKb?8usE*3Y{$MgKB`uKcXC)K-&x=pfrHlb(J=t;XS z&aAr*f8F^Th;K~MFJG^O_);1_q$9cgko3Wg&nEpkF24-?GVqJAMc4({1-G6B@Lq7d zJs;mUH=fAH<2wCKTorg#hv#v;o_=3>zppo;PI~a(rJr;3{n#&U|*lvumS;aM@!gkZ(OH-#Foi}wu)DPiL>jcJM2Os9;ZB}s&)Z=yfb$jdm zwP?=h;`K;*{Wo=LLMN-M?Vs1H20!;Vgk^oJu+@Qa8|!Qvzi@ux;-nc@A~`5|h0ZaW zSE&gVxoQijtpS^=W~+BF-@*I}>+weG7EIk?-otUL z;I|5X-tSdR?U7THoG|q~{jx+4+zBg_iUJkkPD$Tf+Y%4dCqjKlIW5$NPX^8zW8&t=#LbV1yEG>5(wMku`Av(LHNR;6v5FYEqJi#M$<)8b{VU)KDx?ni=$iy!5lANn}yin(bdeL1J3qs|E zIwchO>*7U!4v)*f$cJ+@Kk3VH`R3v{nxE)>8FMxwh&BE}PSw@BhoDpHK6@NS6+|F!#{+M)Q7d7G<;aYy3t#QiWQ zWw%VQB;7pokPmaJ04}ib;|agJ0Ded7YR5OVS;blYi5^~;gdcc-cfgu?-ew&oGak`% zWZl#1Gi_Ws($LWNhk0x8nT37<_|ZiDp#MN#s-x9eyF4A=MBGi_TYYt0y^Fq_(p|jO zoAujyUx!@0h;Kx)d&AV1=pXCCeVui>1#xMe_n3&wo6JMRl?~a&+kaeH2ks32XMF5M z%;SyH^TpyK!vnkn z*2?oX>u8wqzoDashQ3eCTZ7Lm^b5d`Ch79^$}`Ypt_(C-%Siy8jU`ckt0Jg?50>~#>g zvL<>f;MIn0!>+6WU$W2UwYCH>pbIST<65Lqdq^i0@Lorqr}D8l?mU2>8IR$C^+|9c z;OTx7ys)>i9?fg%ca{ZsgXgklj{Q}PS26C?!FxvYoZ&HazS1-N4E@%kgE40~AQj?0 zHOS|Jy;3B1N+b{RQLu*#=guPkr}2JumhweHia1cOn5Vcmg}Ox$Q8n<4$3TQ+i%xrG zz?In(aZWP3hx_hMao7*sViX+UpqM!{a&N(naZNwS=a{fdwQLsvgO6~S8t->(@w734 zt>KWcO&Ef0!VoO1D0UULq*-GsRv2qF!RRR(unju-2mxmZM#h zhhXl5(8;=sPwxy$GpmU*tI&4Tu}@$JWkw0sgPYGp8SjQ`K5pzRrQHwQ@PbttYF6BT z3kg49Y8!H=#{ObAeG<(*qTh)gvGUjFzP+#!e0hO_6IycdC(ZYH!}g>&p0CHrAb*{8 z7{>EsZzt9D^WOg5xJmgzavh_0=#S6n2ltr`J$!xpweME9