From 75d33aff3fc70ea049e0af7adac8f62279ce27e2 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 14:33:10 -0400 Subject: [PATCH] Match mus_rg_naminori.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_naminori.mid | Bin 0 -> 6050 bytes sound/songs/mus_rg_naminori.s | 1697 -------------------------- 5 files changed, 5 insertions(+), 1699 deletions(-) create mode 100644 sound/songs/midi/mus_rg_naminori.mid delete mode 100644 sound/songs/mus_rg_naminori.s diff --git a/ld_script.txt b/ld_script.txt index 285353050b..796e98ca0a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1000,7 +1000,7 @@ SECTIONS { sound/songs/mus_rg_ohkido.o(.rodata); sound/songs/mus_rg_pokecen.o(.rodata); sound/songs/mus_rg_santoan.o(.rodata); - sound/songs/mus_rg_naminori.o(.rodata); + sound/songs/midi/mus_rg_naminori.o(.rodata); sound/songs/mus_rg_p_tower.o(.rodata); sound/songs/mus_rg_shiruhu.o(.rodata); sound/songs/midi/mus_rg_hanada.o(.rodata); diff --git a/songs.mk b/songs.mk index f5df017f8c..02f18d166d 100644 --- a/songs.mk +++ b/songs.mk @@ -411,6 +411,9 @@ $(MID_SUBDIR)/mus_rg_load03.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_masara.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G159 -V100 +$(MID_SUBDIR)/mus_rg_naminori.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G164 -V071 + $(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 8a7ddfe8e2..30da588835 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -521,7 +521,7 @@ gSongTable:: @ 86B49F0 song mus_rg_ohkido, 0, 0 @ Professor Oak's Theme song mus_rg_pokecen, 0, 0 @ Pokémon Center song mus_rg_santoan, 0, 0 @ S.S. Anne - song mus_rg_naminori, 0, 0 @ Surfing + song mus_rg_naminori, 0, 0 @ The Sea (FRLG) song mus_rg_p_tower, 0, 0 @ Pokémon Tower song mus_rg_shiruhu, 0, 0 @ Silph Co. song mus_rg_hanada, 0, 0 @ Fuchsia City Theme (FRLG) diff --git a/sound/songs/midi/mus_rg_naminori.mid b/sound/songs/midi/mus_rg_naminori.mid new file mode 100644 index 0000000000000000000000000000000000000000..3ac684ac24e27525f15c169380060433ebfd3133 GIT binary patch literal 6050 zcmdUz-)mdh5yy|BpMq>i7Hw!6@${uTSy{~`OCx##GY>1%gIkSo=aw-CpERPKPmqfZyR(Q~XoSx*=khxX#yrokE`lo} zmyyfqT4DuDsk(q$!PtWW=7I^4qwBk@?_$4;{Vw+Rt(U4+reii2@Yq7=HV&@k-8*AwT z=3vRV;zdgF5xt5iLV9PlcPkXX!g>|Cid;j#MpH_Sshtv$u0wv>9Bg3Tz`TxJN8U%? zcciL3Q`kX*g!DlL3BiLH37P)d*|o^id`^j>O&hoQ^(nE^W;#wD<9YutYVtXKA3R^r zK?dQ}zSf3&9rb&?Ubou+O^!nFlgS`I8GK-OHqF}LKs_~YO6G+-Pz4h-Oq)$^vdQgY zBWiMB+DvkjA$XCorp@Vi5&X#pk8SWP8!Xvo0YmU-jBGB`eKj?y2I2U{^mN7Vx3z~ zm;`QDnRn`Lmzj4N(@JAX=YbQc<6FTl^O0cZ%>{l+@tjm$dwYys#y!EF;zEau+}i4T z9sBz5SzI%JKWkpPvv`>o@>-4)`CD@sHzr?Z?1#HVeaUN@8RKnmSXc{pIev%Bak$I* zJS?*2$Q|-Q+~tFKxYDq@E5;&2BzUCY$Mv_--$u_%9)F8W<9PhI{)gd1@>$KdM7*VU zwj;k|s6J8wG0diE*b4svEC zXJ-}36%GHa9@TFS)Zx9hA#Dl>FGkv@IV?yTY_xHQ^KrC*_d9 zkJi!yt3B{MeV^P~x6s$(;`*(7AOG*^lWrBfv*|V^rt^?zE^ylOEuOa=&qr{6G<20Y z^Dpyt$-GL(I;a}Ppj(Z@7Ik%#IBHQ-w-VbHy_N3 zm#%-kWnSe9d2T)5ngZYlfG6@E&@IV2h+533IAB-jZdvvD7W1n5RkvoQbok zwUblr1*SaTvU(&;G}JQ#Hp7^rZ>&QKWy*%a2gO1-V-EIJEl&>LvAPpTIp1>^?>G;(B)y5cxeRQ zmTDHbMi0V$qWA8hzo#KmyK^T2?s-ijD)pKYk7J4Md6X%IJt3k^Z9JFMHQZ;!du!+! zxxU>+SH46SzA68y{~~wDDR&yB-O&80%Jp-&gd!!-N?L5SS;D7O&ntabmT!`lKE(Z- z&?g9fZhGZL2LJ|*4> zF5q0>M(RCL8@LlWhWgUy3~nrk9BZ~Dn3J6fb>d6)Ne=C#jESDFWyVJaPDV>dgs;_4 zLqF9+p1NoE>RET{CI!NIPKU66O0_0tHjUzvNEBWc`l3iDB