From 9b9fa16a5cb032dfeb2e29a1c810b059400a629e Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 19:35:12 -0400 Subject: [PATCH] Match mus_rg_ohkido.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_ohkido.mid | Bin 0 -> 6969 bytes sound/songs/mus_rg_ohkido.s | 1662 ---------------------------- 5 files changed, 5 insertions(+), 1664 deletions(-) create mode 100644 sound/songs/midi/mus_rg_ohkido.mid delete mode 100644 sound/songs/mus_rg_ohkido.s diff --git a/ld_script.txt b/ld_script.txt index bc94449ff5..341a035c04 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -997,7 +997,7 @@ SECTIONS { sound/songs/mus_rg_vs_last.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/midi/mus_rg_ohkido.o(.rodata); sound/songs/mus_rg_pokecen.o(.rodata); sound/songs/mus_rg_santoan.o(.rodata); sound/songs/midi/mus_rg_naminori.o(.rodata); diff --git a/songs.mk b/songs.mk index dd80824bbc..0fbcc25002 100644 --- a/songs.mk +++ b/songs.mk @@ -438,6 +438,9 @@ $(MID_SUBDIR)/mus_rg_network.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_nibi.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G173 -V084 +$(MID_SUBDIR)/mus_rg_ohkido.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G161 -V086 + $(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 d0b0b31e5d..fd3372cd19 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -518,7 +518,7 @@ gSongTable:: @ 86B49F0 song mus_rg_vs_last, 0, 0 @ Battle! Champion 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_ohkido, 0, 0 @ Professor Oak (FRLG) song mus_rg_pokecen, 0, 0 @ Pokémon Center song mus_rg_santoan, 0, 0 @ S.S. Anne song mus_rg_naminori, 0, 0 @ The Sea (FRLG) diff --git a/sound/songs/midi/mus_rg_ohkido.mid b/sound/songs/midi/mus_rg_ohkido.mid new file mode 100644 index 0000000000000000000000000000000000000000..fa4710a234e641b79be000040d931f4a9f37e7c9 GIT binary patch literal 6969 zcmeHL+iqLO72V2_XCi`V03ikl6iAJNaHYzUh(Lx=*HB4Fq)CQ^MCsTdE!#Oj)WSgn z6bMj&PdOGXseR}}M3Hpeev}{@KQ}|9}xa~pI$DKb^A5_ zeS$ts%#(hPK3)#gqh+FxZ*HhZH-TAT7MKI(fUEW5qgA3$b@-P!#pLJoe1iIk4bmUd zn@PHSjSh=}+AR_tR)7`YI&dAh1>6GqL2=h7dVT|OS<)3mgh`1g1Iru<`zRR z&L(%OMEwaOUFBVqx4Pr8`LF_HZx>x?PVE-RdtRcx{sYP(8Oj~r0p0=DfpuWRCVwxv z+px*uT}N`+4Lmj<)`7f6bYK5YGB9!G;aC@tumG1lFb^z*DOub7zFwolQr+7vVXqiY zNk{9_u%(E;B9@y-vWayKSOa3+*MZoEyYW5g#a~mz+MrtFZsQCOcgbXBGIZTNVTSf?;z<^I!$qAQ%Jg?Q*%grgg z;$0=;u469v9>Cj(9ZnmuF&i@VKqG!i)dQX%V=k%b4;;xz8tBqvvjzMNPGk$1u9`$4hXzO)ws8m z?PXeeDPdfB{>wn_wFC{!eK1v);vP}uq#n6JcsYIH6)Rx$t%Vt3d_(DFr87#;D1Alg zl+te~{kn86!erym*QGW3@+WkxHwa&%w!frWkfmJ*Vp7}Nz-{2Wz;}Vck~-EUPv<;+ z!_!NiUhwoUJblH}DNn!Y={LMqK=frs61E{#Yn46c zwj1}7$NHA1mp%PU&eUoU3>&F-5l%&Rx{_>HcSf9`1JiEjc2q0JRdzf$PqoWfOO*hh zO#%rIB&Hln@gi*OY6*e_f#iq{B*$zQ=$C^yXk&<9WE-d(*#`JUwln|=C89(Xj!O?7(emqNblnGOhGr;Si_xL(Z!9ESUI(0t-zl`{)A-@^qnUQ>E ze-3_g@Jj>J;&19XKes=JxH-gK6ra=T#5@%0tD}WbJzfAV0vAbrwMC!lEjn`a-bNd5 zOB*SXZ2{{AtQSCk0rb!EONU9wKu0r(n?aoOzut7Ro4oVbpU3_@^3D(BJW?pPhqIppEvb8#80&9Q$cp3zU6$p`e}20g_v%8!yj&rm1VOz!1~ zI;%juVLEvrUQ(T6Gx-!R!@VNWQ@oO3S7I;Jy*<3^J9!}cxwu?&O7fJN-d;)KQyi~< zuJl_<|CC=Gl8b8=njUhRJjK9cd#3=Dyv@`|Uc)a7Uijg~e1#V{3oloH4Sd#w&y?(= zmlq{^ia+aJ_F^T= z3TV}G>?EJ#T_SW!5i;(#2fYTECb+t3PG*fNDmM%c4h|@0>azenh7imr({!$3+o7XNd48rZa#!s>CR6rfyAtYIw3bC{Mfl@s z9JT7!tFYtg9POKU)iHGxZm4PT8(NUr8@qto_2p??znjZgcxeh=6C0N1Uza?c=U^dL*q)~ma}I7^oxtI6L|}7tiz7i*+%&T~r;_TWk_jUnE)~)te1zB~%A^y6`HEJ+z63 z60fde<0?+@>O+HR*_!TM16~tvc8%A=cIu^32C0yB*w3t0F9Ul9dFFxhz&RkEg1uQF zp1`NXy=pzg?F{l(wvV%TzG}Vk{#>84%_Ix{zwZya@wsHs=YX#9{rrgj71HN?KYx{Z z;@8!m@Wp%LXDxm(vi@=ZhpkVO=VAJZe