From 6a9b972491ddffd3794f4bc910480b5b6527ac9a Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Mon, 1 Oct 2018 16:08:57 -0400 Subject: [PATCH] Match mus_rg_demo.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_demo.mid | Bin 0 -> 6142 bytes sound/songs/mus_rg_demo.s | 1856 ------------------------------ 5 files changed, 5 insertions(+), 1858 deletions(-) create mode 100644 sound/songs/midi/mus_rg_demo.mid delete mode 100644 sound/songs/mus_rg_demo.s diff --git a/ld_script.txt b/ld_script.txt index 42c2cf0145..38f9f54941 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -972,7 +972,7 @@ SECTIONS { sound/songs/midi/mus_rg_ajito.o(.rodata); sound/songs/mus_rg_gym.o(.rodata); sound/songs/mus_rg_purin.o(.rodata); - sound/songs/mus_rg_demo.o(.rodata); + sound/songs/midi/mus_rg_demo.o(.rodata); sound/songs/mus_rg_title.o(.rodata); sound/songs/mus_rg_guren.o(.rodata); sound/songs/mus_rg_shion.o(.rodata); diff --git a/songs.mk b/songs.mk index 43b85f947c..26a47e9f68 100644 --- a/songs.mk +++ b/songs.mk @@ -348,6 +348,9 @@ $(MID_SUBDIR)/mus_rg_champ_r.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_cycling.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G141 -V090 +$(MID_SUBDIR)/mus_rg_demo.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G136 -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 04f8e24e20..41f3aafdf1 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -494,7 +494,7 @@ gSongTable:: @ 86B49F0 song mus_rg_ajito, 0, 0 @ Rocket Hideout (FRLG) song mus_rg_gym, 0, 0 @ Gym song mus_rg_purin, 2, 2 @ Jigglypuff's Song - song mus_rg_demo, 0, 0 @ Opening Movie + song mus_rg_demo, 0, 0 @ Opening Movie (FRLG) song mus_rg_title, 0, 0 @ Title Screen song mus_rg_guren, 0, 0 @ Cinnabar Island song mus_rg_shion, 0, 0 @ Lavender Town diff --git a/sound/songs/midi/mus_rg_demo.mid b/sound/songs/midi/mus_rg_demo.mid new file mode 100644 index 0000000000000000000000000000000000000000..f5320a273ab148d93fd855a9d51ce34c9e04374d GIT binary patch literal 6142 zcmc&&?Qc`p8Gn4w#w00$8U|=XKQGUo2^ZTvEBgS63hWx<29_9`|tg*L*JqzD2iVn$*1( z^F&UTl}Pv6Nz%1eg)ZzbS}@q}qsT)j)R3Fr{#v#AdHcKy{!sUtssx`{uB5fZU5-(0ylmX%Q-V*2LWc}KXY!cADZ!ToFPQubgKrA{Nbs#AmGPDt z909c?YM*qwmPFUoBd9Z8VP;T(>6EBU15N=>0j2;`fRlieUXeOmnf0v9LONMi#)S`c zj-9pAo)&WRrG22A9}Jt_q>G&VIk;W zI9<0f+EpyYHa0@RCpp^2blyYrtJnySEPSX;z{mHY71?h)jEIDaXxNKr7_PAfRjk1_ zR-lR%*r!$ac6mhLiHbrl<}DzH7274RjtM*v3HCaG%zS7m5p2q(Pt8Mnv@*tjvvz>Kx$pOQL!m za6T=n^C--FZgFkeUU0(qcvRrp<>?4#BD@&p4-RuFT3y&HaltRm-nC#%(_iCsA9n&4 zL2Zg-?WKAG3IodfA(nUst*mImhxal2E%`CXkG+EYi|vQo><%Ix4E7Gr zVZ;$x$635HR+jKZZE`QR*E!w^*wwbY{9tcqBCl!6F5groP%isa>YDUNm90xcg?y)+es(pof&GKLtS1XEmYadxKD*1E zqOs6JjWcKJ-m zI%!y^i4(#~5D%N7F0zIRZxq%A;%Q;c5YGuKL!2|MdBb}5jSaN?X;NEJYoAA0XjBG` z%AiphG-bh&yP?B!0|$r>B7UYnZ9uKzI<_C$91{jFhIpB*tiibue<-XEr1k6WO`CL0ITxrG^2w~|fZFp1 z{VM2Jy`Y12p938i;y(HLVssN1qw0-{FIkp|56#yvB`L|5@P;V)Iz~WpUh=Z!55v47 z`Ih8Q!n%|AQQ25p6`R39F#kkf5n(1-BeP!F2*?;2CrjvDxd;XeqqaOQMP2 z&08^&xC)!`A`O-zTXB-jo`SAMv#01mNcDj3N#ovD(gRu=o_whe5I^ZqR+N{{mpmJQ z@Ysy!l`m?>3L3|6U$~8^CNz6txEC;vI2})_MDer|B&8Ey70?wb>R5>eRxL0LJZejD z*^Gbct9j0p|2C5H7cbF;cIpLX(V?>?Q@J`zk!CDMy^g|66%lv|mzN;38O!cTf_IJj zb6OAIEt;`nn_h_qwUyTfDTKVbVon!qcIg6?)T7RJ092QxJ*rHQUq3u5lR@ha*(>Ij zO{UW9$Dr)+M$qjVh4H>sF=K?QuMh60>UdPS}G&^-~Gv2q7>6$tuqArQAiaVYAR zm|o!q%5J^ARv=Ta=$a1y9*hI3L342o0|rbd-o{5wfTId7iv~3}sI}iZW>b{}iQ=mY zf|IJzzy?zNo-V3Pq&4W0Xz1;U+wZvcOD~BGT3CFwWShxOv z#DDE7(C71x_zcJ3=ktaC3w(r=12IJ07+TPa#gDDz;Rl5+JHFlMbM{|G|6lp{<9JDa zj_t+&Jp7Jv9<-h>k~?snzhj&)_0!hhul_*)CX95tBmgBDf({8{Nv{byEa`PYM+N;v z(oY4wCFzu)enAOA=LL-kniMoG=$fFMpk+b767;d4-wFD?AV)mn_YHmz-;D%k&Ck+A zkNCR5SM`UuOD0e2k8oh6MWp{;|9MeI4bxJlYeCJ>w