From a300a9799c01e98182f4c972e64f0ff0669c1866 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sat, 29 Sep 2018 03:26:30 -0400 Subject: [PATCH] Match mus_tsuretek.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_tsuretek.mid | Bin 0 -> 6431 bytes sound/songs/mus_tsuretek.s | 1217 ----------------------------- 5 files changed, 5 insertions(+), 1219 deletions(-) create mode 100644 sound/songs/midi/mus_tsuretek.mid delete mode 100644 sound/songs/mus_tsuretek.s diff --git a/ld_script.txt b/ld_script.txt index 3f1167bef4..e24ed162c0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -903,7 +903,7 @@ SECTIONS { sound/songs/midi/mus_kakkoii.o(.rodata); sound/songs/midi/mus_kazanbai.o(.rodata); sound/songs/midi/mus_aqa_0.o(.rodata); - sound/songs/mus_tsuretek.o(.rodata); + sound/songs/midi/mus_tsuretek.o(.rodata); sound/songs/midi/mus_boy_sup.o(.rodata); sound/songs/midi/mus_rainbow.o(.rodata); sound/songs/midi/mus_ayasii.o(.rodata); diff --git a/songs.mk b/songs.mk index 10973bcd4b..a5c3a1f835 100644 --- a/songs.mk +++ b/songs.mk @@ -387,6 +387,9 @@ $(MID_SUBDIR)/mus_tonekusa.s: %.s: %.mid $(MID_SUBDIR)/mus_tozan.s: %.s: %.mid $(MID) $< $@ -G052 -R$(STD_REVERB) -V078 +$(MID_SUBDIR)/mus_tsuretek.s: %.s: %.mid + $(MID) $< $@ -G066 -R$(STD_REVERB) -V074 + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/song_table.inc b/sound/song_table.inc index e1bd4deb98..58b0723046 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -424,7 +424,7 @@ gSongTable:: @ 86B49F0 song mus_kakkoii, 0, 0 @ Trainers' Eyes Meet (Cooltrainer) song mus_kazanbai, 0, 0 @ Route 113 song mus_aqa_0, 0, 0 @ Team Aqua Appears! - song mus_tsuretek, 0, 0 @ Follow Me! + song mus_tsuretek, 0, 0 @ Hurry Along song mus_boy_sup, 0, 0 @ Brendan song mus_rainbow, 0, 0 @ Evergrande City song mus_ayasii, 0, 0 @ Trainers' Eyes Meet (Hex Maniac) diff --git a/sound/songs/midi/mus_tsuretek.mid b/sound/songs/midi/mus_tsuretek.mid new file mode 100644 index 0000000000000000000000000000000000000000..82664c27a120092d7e0076b76ab0bbb0684cf6ba GIT binary patch literal 6431 zcmeI0TWcFf6vt28Ay&;$ma;8==>_^w7i63SliFA|i{s!VIEq{=!K8$y(1$`_M8ANm z$m-I!$g;A~Ptki`d++zihv-wm{b^>-?plr`2U1FcU-ak9oclR@G&9$mpMD}DXXT8% zEYsJUpMM7RmK9GpG#;a9@%9XXg2&u0FSpLgV&*Qyd*nOv5s zMD90R=8LA-faZSl?vMtP5mdfrSXa6>q|u|O>kh~1W8cYv&r~n*oa#G4U8vi+k@{5w zJs)r;pw?CM>iXnq20^7_O?jxR?D<+iRs-0Z;BnEO^@DeGaGwb;1;+EZh{T4 z0oK7fxB+fR9I)6|xo!5hrP{j;UdGN<@T!xGkgN2rL0@BC^=;zcChOz)RnI#7>+mP& zNzm)%Ov#SLj{0dHV{aIj9f{B8@zh(^#i?=oJQV!i-}aR}k(wwCVJXAC$FnqB{Y)+d8LO1jA*X6i*~HbZ?p2f@5RX* zGBqdttya|866y1ebQoHFdb`sQJ3^cO4c2e4&+zFm%=&yo9fn1pq13qsGGsaotNuE; zE^&ViT+8W#-|MgT8A6=|I}D-DWhWmYUkUOy*IUQGI_u;3RnHpyYw$0kcM-i_&Xnv} z=jUO6%l3xx**s1kU)fJDuW|c4*gPK_*x#Tj$2zPE{;vQTo)q4MLKgvVwCth69v5KI zRbR{R4f%ntdb1*Lyy|`>oxY5z$K6h z?oz@11&~p=e-XS0&V%z32Q2ngj*4Ti7UU(!3$%6m4(qig{So?=KOQUZ?b(u_5q?VW zf4sbp%jWT}kf)WByw@)wU&H)amp_eD^QiP9@{7p({Ir{615gKw1iw%TSSxqvADi;y z(GH#3k;y~`9E`f_A_HbfmsvDmc6Hapj?iXsiS37@+-nG34X^X zwy*K6Vt*BRPsagOpO6>p@}m4cKem*gi1=i{7f2lK=7}Bf2{j15PzfkH)ch@fiu^RZ zczh%eW?JS;&I19>gPFTS8caq|`I=!}>DrJ+kD{(S9H)?*w(BZs$ho zR}J)hz?pzrSIw*Ilc$xhgg#S5-sw}CK5%y8fF=Fv=W(e1IULt_r~Q$CuTT7LOZiv6 z=d(YG|L2e8uMgzmWB#9+hwn?qLrls;OvXb@%0o=X{XXR(W`s5w4>2hZF&RhOl%s9N zohIc@lX2%r8z6U=l)FpDkv8QaCSb9za@*|l5R-8pNO_3KxGSXGZQzfPt7IJAQyyY+ zeY{g(r!tmb^>E%ud5FpQe@r<)1UXZ(W3i)tn#b51#$`w1vw1u`#JD&$Zl4EvNG_+6 zLd?6}zLMut^QH0dK9cetliSgC&HpIB&tJjMdklH61pP%l3OVcQ