From 865398e7010716de870e17a7ec5c2812b39e39e3 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 01:19:11 -0400 Subject: [PATCH] Match mus_rg_kuchiba.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_kuchiba.mid | Bin 0 -> 9915 bytes sound/songs/mus_rg_kuchiba.s | 2537 --------------------------- 5 files changed, 5 insertions(+), 2539 deletions(-) create mode 100644 sound/songs/midi/mus_rg_kuchiba.mid delete mode 100644 sound/songs/mus_rg_kuchiba.s diff --git a/ld_script.txt b/ld_script.txt index 39f395ab0..bdddd7143 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1008,7 +1008,7 @@ SECTIONS { sound/songs/mus_rg_win_tre.o(.rodata); sound/songs/mus_rg_win_yasei.o(.rodata); sound/songs/mus_rg_win_gym.o(.rodata); - sound/songs/mus_rg_kuchiba.o(.rodata); + sound/songs/midi/mus_rg_kuchiba.o(.rodata); sound/songs/mus_rg_nibi.o(.rodata); sound/songs/mus_rg_rival1.o(.rodata); sound/songs/mus_rg_rival2.o(.rodata); diff --git a/songs.mk b/songs.mk index 1715a6b82..3550dc373 100644 --- a/songs.mk +++ b/songs.mk @@ -396,6 +396,9 @@ $(MID_SUBDIR)/mus_rg_kenkyu.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_kinomikui.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090 +$(MID_SUBDIR)/mus_rg_kuchiba.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G172 -V090 + $(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 673a0aba5..59f628cbb 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -529,7 +529,7 @@ gSongTable:: @ 86B49F0 song mus_rg_win_tre, 0, 0 @ Victory! Trainer song mus_rg_win_yasei, 0, 0 @ Victory! Wild Pokémon song mus_rg_win_gym, 0, 0 @ Victory! Gym Leader - song mus_rg_kuchiba, 0, 0 @ Vermillion City + song mus_rg_kuchiba, 0, 0 @ Vermillion City Theme (FRLG) song mus_rg_nibi, 0, 0 @ Viridian/Saffron/Pewter City song mus_rg_rival1, 0, 0 @ Encounter! Rival song mus_rg_rival2, 0, 0 @ Rival's Exit diff --git a/sound/songs/midi/mus_rg_kuchiba.mid b/sound/songs/midi/mus_rg_kuchiba.mid new file mode 100644 index 0000000000000000000000000000000000000000..11cb67d1af5ba17c4443072f9cfaa90d11954fa7 GIT binary patch literal 9915 zcmdT}TW?!g6<*G1_GzN?Fhn4o7e*0vGwyAgiK1!KG>K`F<|0qxsBUDMB8-Tj5|tP+ z^I(L8>s$&Cfb866enxK$@HPbo_#yKfcrD*rd#`h|-K3~g)0Zr-wb$iam%Y!~Cm&Vr zZ4!~891T+VQRSCE2lp<$sGd627oMgUYo7o0ujqxzZTz8#zdxiGm&t0GJbgJzkG^w} zz8%ouF!`g@ns0;;=7}B+;`fb)d2oZMH48cmI^PKFT8&!E&|7A`GPO#Om$1GJDzaf} zE#dbPWDB4R&Y!c7Wf?yUhyz{N8nI3KOXCUzR~nDR*0{&wifoam!x-BFm*zfQHxH(P zNo(ME@jnlos8#C*bhu86|0ejGob&M8QqPz5xwEcXuVjC;-^bN;0dphsfVqi!iaM!J z=SSvGWl@}3JXdb!qz`VrwSrk&adltC?^X09lA+HXb1MFH)(p?C>WE)w+ggLKHRo4j zIsbxFbB|)duVPQ)9H|qJ_6Ql?8BtclQPfxlwCdG)dNc^H9XkkBRJ|w?{Mkt~y5_3M zyUWBe;Lq+flgfG-5SO7BWdncT#A<5Z|ED^B8Daz9BYz52!hYtCEscAiUMG##b6D?h ztyVnDp4VEa&{Bm(eSE4dR=o#{>_xTf>}>$N^|}DMz*def)%gT9tvPs`gWW=v*V#U8 zxAtic)7cMH7UkR`EiHYxXc=^^=E0lSny>KLW};_>_Z2-~ zqQ~x8Q6&Et)Lz~U9_RW)zZ^8NbspzPq^p}@6FaZH0*c+(E{RsaT6jpP*7BxdBdi)0 zLp$;Xqgacjd3E1DneP?&w2`gvG|uOz=&}C^o|e>JzYq6*;MWA*x{Lb>wKqy(a{~%@ zK<|K7BgJMl)>^NcCXCuuP>9=iDoJ;+lQiHiiW9QFN;j%52x#vhcPhrNmTi#rYBC7i zJ^z;V*g!EGvZi%zV+(VBTnrA{#x@on?GYXaoA5Z?guf+xzIn^>)f%toHRtxa(|1X< zZ#({W%07tfkMnQW^G(Em9@;EE<}A2vrd_Jb#2^c9r)jT%=eDkb=K(9-b)y3+^179; zVSNqyYtV=1w#^D%4i%V>C^k2dYD*zShSJhi@nw)<*hF^lVPI_9RmiKLx9T1{Yu~PU zb{!+Yd@5!?PgXMKZCHypP|@c4u~x`HWiEbA?fE)OD^0vwKos(}^M4Zh!@S}>_Rksr zn&&Tj{trC=zG1C4Hgyx5y}exZWK-dY5q<#_M+Vk~k2bTJp}&>siQCLM@@FXL(cW|; z*uuNc-UR3b(UZYO7a7)1ptm;#A5%$R_}w8(_;+hh2BA0E@U|vdzwU{T$+{8V;W|lt z@$))ye%LTu9|F@ju#AIFfJcq?u7bbHwZiXd$hdw}ka6yKhup$@;a(AZQP$sleHFtj zFyI}2uLw+x1@EkkErnZgYHnKh6Vx$PZ}sD1%N*g&WecN<-Uha}C!CK-;N@AE0A8+l zrp6LibHcm1)L(N}92)z$x$ZWfy=T$lxrUh6fUCo{n+)?_MBa&65d2e^cb=DN%zJWv zv{p)!_`AjH)+ddpduJB$c@839_+6}9Opz?HFC!WB)b<8^$XvTzBAp&~9ay24$?4VW z2h6C|8>?R?hrMy+j&nfbU%`xCL4Dj=5SqmwhLB>fBp>)f3Fnn=hc7?U~YLX4d&B;4#=Fo5B`1hLGf7JYNv9>7ce%bXP74DBS_%1xVzVh zc>iwW42kA0yPxBHtsmsKjoc8=!#TnAAUCpHT^l7vt5r{ThxT!T3tF7wy{g3PIkKDk z3W8lhFk3t}PxH2jvI)C1IfkQl>0;@6@1|%P1vH6=Al__tlcb9~#2ZOBscb4dxV9%? zr<+?hoAn##g~L+H5+4edPx~8kWmd{%=gm9NMV_`lTMytr;D)=hTV99!f?IcoRP+Gr z`y>71EWze(s&~@vt<_|Ys7svWb-~qPLZz3+qvxNHC{B51IZflU^f_s3Q_%nP@ z*umXb^s8md;{q=HI`r^u;Q+Vp9o&ra-1}`lpf(@)!F*ZV z0WSMFszpXlYgBKah=)4)#0!>?tyxpG+NJLz5lRO@penl zo2pQ;!lFK0G7e{|-tG*0sXH%12O=JqklkrmDaGXgrsi-G-f$5+oQ6GKyq$h*SNb%E zX#GHCQBE#WaZyYd^K?0B1?-uq^K%})MDF5-h>wwnt2J*IA5afxD`s~#@e$Jh5B-zq z3;(D5ws}<8B%HSoaXudvMwvpSbhA^AGg(who>iSoQV-sacOmv&T)$NQTH_(rUh!XR zoR^pK?XTn8k{@vDoa%hm+?@8BgL`hh)VPOu>Q(ik~xpUz7C)0eL3PtlUZ@n>xooTr*{2$3W?_Efa@UkG$^TH2B zJj>mlg+1=lU9`;+V`qq?prfFSlR+{;r%P{fbHo}r2OV}+FNpjoZ>d(jGY&33Qgx-; zV8x@2R~k>E#jE;Cbv;Wp52fjRvUSMvin~+Z>5up*mpuV(eQ-I-JLY7obabXn1@!NX z+iNA_P|k10kM8|0QId0s-Re#RQ1OISXDc4vYB63F13X1F!gbx$#3J=kv{J2wQuY~R zE`(0Y`ikC*ydTrQ8uVwp6uoC;)&m0a>bL4m*B;Z#_#2)m;6one+j;#t3&AOu6*9{RkwcC@lr3~UQF`H zPu4+4Sq@rrv?~vLk%Ow9_*FlUYkyMq3Ay4>J&B)KSO3}myjGmAE8kb}bC2taJVQsN zey5_1Mn9u}|AzkJZXdF_g3mW