From 6c460c94614ece8ab7ff7795f4250a7a0874e153 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 23:56:45 -0400 Subject: [PATCH] Match mus_rg_titlerog.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_titlerog.mid | Bin 0 -> 4192 bytes sound/songs/mus_rg_titlerog.s | 2087 -------------------------- 5 files changed, 5 insertions(+), 2089 deletions(-) create mode 100644 sound/songs/midi/mus_rg_titlerog.mid delete mode 100644 sound/songs/mus_rg_titlerog.s diff --git a/ld_script.txt b/ld_script.txt index 17bc47ac6a..d05d62e451 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1016,7 +1016,7 @@ SECTIONS { sound/songs/midi/mus_rg_fan5.o(.rodata); sound/songs/midi/mus_rg_fan6.o(.rodata); sound/songs/midi/mus_me_rg_photo.o(.rodata); - sound/songs/mus_rg_titlerog.o(.rodata); + sound/songs/midi/mus_rg_titlerog.o(.rodata); sound/songs/midi/mus_rg_get_yasei.o(.rodata); sound/songs/midi/mus_rg_sousa.o(.rodata); sound/songs/midi/mus_rg_sekaikan.o(.rodata); diff --git a/songs.mk b/songs.mk index 4ad429c5cc..8ae97a6158 100644 --- a/songs.mk +++ b/songs.mk @@ -519,6 +519,9 @@ $(MID_SUBDIR)/mus_rg_tamamusi.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_title.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G137 -V090 +$(MID_SUBDIR)/mus_rg_titlerog.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G181 -V075 + $(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 beeb4c56f4..26c62b5c24 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -537,7 +537,7 @@ gSongTable:: @ 86B49F0 song mus_rg_fan5, 2, 2 @ Fanfare: Pokémon Obtained (FRLG) song mus_rg_fan6, 2, 2 @ Fanfare: Pokémon Caught song mus_me_rg_photo, 2, 2 @ Pokémon Printer (FRLG) - song mus_rg_titlerog, 0, 0 @ Game Freak + song mus_rg_titlerog, 0, 0 @ Game Freak Logo (FRLG) song mus_rg_get_yasei, 0, 0 @ Fanfare: Pokémon Caught (No Intro) (FRLG) song mus_rg_sousa, 0, 0 @ Game Tutorial (1) (FRLG) song mus_rg_sekaikan, 0, 0 @ Game Tutorial (2) (FRLG) diff --git a/sound/songs/midi/mus_rg_titlerog.mid b/sound/songs/midi/mus_rg_titlerog.mid new file mode 100644 index 0000000000000000000000000000000000000000..baef8d1d41605be167810cc7c66c0cd69a83f028 GIT binary patch literal 4192 zcmdUy-EI>{6vxjDZVm|%3L+E>ff^7>69U1aKoR1@C?TXt+}Okza!`MriT?ZRu0=s%`Qf^f$-5w(G==)T>t7=(orJnKSc0GqbzN6~A~PB7Nfc zOXrH;d_{Cz-j!1Bz4T#uS2)yn>ZQE9EKRBJ2l;7IHiy0FcQR0x-z6*2i?97ll0@rp z9hPAkK7mi*DqI!W92hyUO;n<7DYVV^%#*Z3$ zjIT`W3z{!zzM%PnEnolKCMuz~d~v@|o}^8*jNbCaeaBecZK5K&`GU-)r(QtESM*{i z_5{rnw7EbV2ZlWB2k0eq{6uBAU;jj3MsIoHzH^MOHc=7Xyg>5;!x(XnmR{g@TceCb z)7($fW){xEIXDOB;XGV~i!cxKFc~Asxx()&@qXLWHy!td))$8PEkis-E0Dg?8eD^q z;p32tdChZg=NJ9U=OH%? zYxWq1u~wkfpv=1G<9z``o2T$8T!YNdysdC=?MJ8u_rXUI244^1L%0aToabSv!yIH? z%+Cz>GyJxm`TMzgO3YaHoLJ*N)MEvP`ow3Vwcj7|JLA|nE$8Ds2*du0=NhdN+xcWY z;(1!`WUdADa3+$u=7@8|@m!->;;^Ug!~5~v%b9pAXk)>oF00&!ecL_PXrhN0GZ$iCPd$clc+QOKs4wvQIz0$hY)*d@3` zT!ckff+e^H*Wfew46eg<_~J&2$GQ(C)6aNvoR7n@=se*_TfIv-+*T(E2ixi>;o-KL z?g+_zoG{f^2iu_@k%7x0^qYF5U;F!2`?YUC`}#H2ufAWUkNKrGRR&t`r$Yt#c~ahl z_tPVx9)Czy>b#GtWsy4Xqbjwn^FFFl&pPj#D$kcX?~y8XJy0*wj=J~kpXj_ps_d&h z`MdQT?brvc@q6hDv|FHEIUD9#sbIMi0p5FT!;LxicesvRMjQyn4W`Vd}tqjHX^ z9EQGiu;i@#l9wMjQp1CC;-cs^`BUz_n)_Zdv#&(HZ8c0y$lFQTYPK5qTy#QqB%5mR zkyzs+vB5`Tjh9h_Ls{ccHaL_uHbH|!Sz{3o)H$>@7O`jlMCVY~Sj0W~yLAp-jYV#a z-%ICE*Vsf2J_?&Yp!tC21DX$LJ`T|NAZ+@8`}I%sWpwiaJM(wzd^9|!1s#5H}u{rV?5A6!izurq(R&Iel42Q(irtasf1t&=V76aGD5 zS4m^G;s~9p(|)H%ybii>9d$b7^_bJ+cAfBg(rMbRQ(jLyJ>&EPyUuz&=k&bOQ7*3^ zIvsa9!R7Um(@Ccpr&qYVe&qC;(~q6r@Os1PO{ce<-u8Oeh3lTvDX-HmTr*B*oqpnZ zP437|COGdj=k!yzBiD%XP9NH}gq-nP`pECdg;Z@;nx3XA>DrX|#{J6C8lN4FdzG=; zJ$R=wT)P9amFru&LpSIQ}ki3%=o6w9uGLVX0GtY zh0jUzjC1^tTP>&v7u7lE^(^)Bp=xKWg48k1<@BW26I9uUS|9T|MDKRZ$;S zsLyN4srNioR8H5jGT3@#xZmVgC)>R2^>+Mt*_CYd{cRTdb*AFre|Lpf&03h%PQ z+np=C%L;F^!n>^SMn(i<@_M3@-k1>o`cmcS#wC&0