From 02deef99fd94d5bcc7cf9fb03d5e322508109b08 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Fri, 28 Sep 2018 22:27:08 -0400 Subject: [PATCH] Match mus_me_tama.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_me_tama.mid | Bin 0 -> 2442 bytes sound/songs/mus_me_tama.s | 683 ------------------------------- 5 files changed, 5 insertions(+), 685 deletions(-) create mode 100644 sound/songs/midi/mus_me_tama.mid delete mode 100644 sound/songs/mus_me_tama.s diff --git a/ld_script.txt b/ld_script.txt index 1848e6215..86d0eddc9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -871,7 +871,7 @@ SECTIONS { sound/songs/mus_swimeye.o(.rodata); sound/songs/midi/mus_dan03.o(.rodata); sound/songs/midi/mus_me_kinomi.o(.rodata); - sound/songs/mus_me_tama.o(.rodata); + sound/songs/midi/mus_me_tama.o(.rodata); sound/songs/midi/mus_me_b_big.o(.rodata); sound/songs/midi/mus_me_b_small.o(.rodata); sound/songs/mus_me_zannen.o(.rodata); diff --git a/songs.mk b/songs.mk index df5b0462b..f7b27ac64 100644 --- a/songs.mk +++ b/songs.mk @@ -273,6 +273,9 @@ $(MID_SUBDIR)/mus_me_shinka.s: %.s: %.mid $(MID_SUBDIR)/mus_me_symbolget.s: %.s: %.mid $(MID) $< $@ -G103 -R$(STD_REVERB) -V100 -P5 +$(MID_SUBDIR)/mus_me_tama.s: %.s: %.mid + $(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5 + $(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 0e32a5289..711d3d0e7 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -392,7 +392,7 @@ gSongTable:: @ 86B49F0 song mus_swimeye, 0, 0 @ Encounter! Swimmer song mus_dan03, 0, 0 @ Cave of Origin song mus_me_kinomi, 2, 2 @ Obtained a Berry! - song mus_me_tama, 2, 2 @ Awakening the Super-Ancient Pokémon + song mus_me_tama, 2, 2 @ The Super-Ancient Pokémon Awaken! song mus_me_b_big, 2, 2 @ Jackpot song mus_me_b_small, 2, 2 @ Win song mus_me_zannen, 2, 2 @ Too bad! diff --git a/sound/songs/midi/mus_me_tama.mid b/sound/songs/midi/mus_me_tama.mid new file mode 100644 index 0000000000000000000000000000000000000000..4190733d9db69947977aab0c71dda2d371aa06f5 GIT binary patch literal 2442 zcmds&O>YxN7{{NuBWAiX(jI!SS^<&ZkVCSpR0k1tp-UXw8+RRVoDFOw11mKL3aylK z0dc{O2?w~uFX6<8$cvjZFKs_bzeoC?@$61g?jbFaR!wM<7>X>6VNI{(h5UE><@=d|tktnConc0m^` zg{)lytB9*$4XlAn;1U=FPj~q*g8#_)D&x0UJ0P|z6O{wjE)#86!7Av19#{iwpbz@s z61W5gU;r+I%is#Q0)}7+-Ue@j5g37Mf!$sMR|B)X3f=+lDBVSKN8rMu~2at#GKC5-KfxUvG0HmSVx{Z7~ou>Vxi(i#EYNN z7b8>cd!W2W1+0LsZ>s#I!0eQy4ock%$37oEdEZ9Ml(hIu=hbOu=9PQvd|0J@ zIWL#`cc<9qU1Ix&nOSdS*6`ee=ia|~{;zqmy{Bu;CtYJcG3FEN`K0;@PpV_i>H37{ zKbGgi3aMvPa?DM<&3*;M+w6NF-f-Us@izMn5O1^J1e;*!Oz)q5qnlyojZWm~;G&=l z23`D;E}VBhHt7Jb6>oOn7UM3yxPey`T~ryAL42Xm#b0&a2 zhBJL|dJ^46W)is)jk1&Y{VI*dlNioyuop8#2}j0#xi+OXGA_w=9_z1^UWB(uY-CK* zFkQRSQ;`0@=sT$kc+wmvxnk})F;NZCJDOCpHhw+XVm`j z9{Nxo^pWunZJf1n_L!!Mi@3jSMBRv!99FZn!shkO89iz6=6F$)K z&zc)H_U-hKk{&sKMD!azqMaFUVQYpM$j)F4opvnvEch(={+Tg!+OfTO3s>2>64+Z; zvL#