From c3ab8a3bff24506fac157dc0dd60ce5fba5d3c80 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sat, 29 Sep 2018 00:02:21 -0400 Subject: [PATCH] Match mus_pyramid_top.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_pyramid_top.mid | Bin 0 -> 2795 bytes sound/songs/mus_pyramid_top.s | 851 --------------------------- 5 files changed, 5 insertions(+), 853 deletions(-) create mode 100644 sound/songs/midi/mus_pyramid_top.mid delete mode 100644 sound/songs/mus_pyramid_top.s diff --git a/ld_script.txt b/ld_script.txt index ccae1e7d6..db8e706a5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -945,7 +945,7 @@ SECTIONS { sound/songs/midi/mus_me_pointget.o(.rodata); sound/songs/midi/mus_me_tore_eye.o(.rodata); sound/songs/midi/mus_pyramid.o(.rodata); - sound/songs/mus_pyramid_top.o(.rodata); + sound/songs/midi/mus_pyramid_top.o(.rodata); sound/songs/midi/mus_b_palace.o(.rodata); sound/songs/mus_rekkuu_kourin.o(.rodata); sound/songs/mus_sattower.o(.rodata); diff --git a/songs.mk b/songs.mk index 4bce4e84a..0cbc61dc8 100644 --- a/songs.mk +++ b/songs.mk @@ -321,6 +321,9 @@ $(MID_SUBDIR)/mus_pokecen.s: %.s: %.mid $(MID_SUBDIR)/mus_pyramid.s: %.s: %.mid $(MID) $< $@ -G106 -R$(STD_REVERB) -V079 +$(MID_SUBDIR)/mus_pyramid_top.s: %.s: %.mid + $(MID) $< $@ -G107 -R$(STD_REVERB) -V077 + $(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 91ca7cf9a..b16a09761 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -466,7 +466,7 @@ gSongTable:: @ 86B49F0 song mus_me_pointget, 2, 2 @ Obtained a Battle Point! song mus_me_tore_eye, 2, 2 @ Registered Trainer! song mus_pyramid, 0, 0 @ Battle Pyramid - song mus_pyramid_top, 0, 0 @ Top of the Battle Pyramid + song mus_pyramid_top, 0, 0 @ Battle Pyramid Summit song mus_b_palace, 0, 0 @ Battle Palace song mus_rekkuu_kourin, 0, 0 @ Rayquaza Enters song mus_sattower, 0, 0 @ Battle Tower (Emerald) diff --git a/sound/songs/midi/mus_pyramid_top.mid b/sound/songs/midi/mus_pyramid_top.mid new file mode 100644 index 0000000000000000000000000000000000000000..5020132430c4b4a693643cc818d14467786ee942 GIT binary patch literal 2795 zcmds(O-~zF6owDOWDd1PRf?#TO;8prkV_j>!KShdgeal`Cj^^7AWfVPVx+246?IpX zvwf=~{)H~-Gxi*NVkhdRk)mw;&bjxT_nv$1x%YLYwtrtl0vVAp zIa8@U{2XgiPPTpDJ2NIH*G3C7ML7vZcAuudpUKI2>3VrP^2rRL~!M_6MI=G(YWb14(w#D2H@J2d!PMSCQzS$pZnvccgd5k;D?Wn-|HrDfd z1M0NMo)+0t87!y!d`X>FnOnu@3V0=}(+1xgjBSFOU{;Gxopu=8>5nzdH;Zp(e4Vqq zgzqJMFMt=a^=+){SMPP$$g=!8E6?Abk%>^WDBqQ)z32Ktpv8iI=;?W1XFdJc*Evt; z1O3F;vZoh){nXP{U$1$(>Fchid%k|*=|f+?^7Lz84?=z9>0@7u-rG&}ZAtp2lz-&6 zQ}QEq>{gRsEz7g1i@}pA33E7#J&K*;JGt@HFL+iu7e3*Z4~(brZ(>|-`#;F<^K#tX zyH@4<#hLI}%c0JPS`2kE)QM2TP)~(Vxg5u-$I>f3mNJk3=2&d`sbf09 z)7j=(ZB<@i;PGo0riU5o!j3x(odohE+Q`zVhPu$rfyN<+fLy|tr9sN%(CFu|n&waq z4|!7By3mcqr7#_K^4B>w3>|5caq75{D~xwm{#=)zIJwC&IXm9@J)OM=F{0yW$Czv! zrHBy$N0nkk!y!5`g5waJ7{PG}PK@9<1Sdvp9AeY6dC(md>%|$5@gg)1p&8;IT%QNu zQRA2g-ytxu@$y(Y#3e>t9O4oqEDmAm**0(f7H@o(huJnixW486y7rHFIPOP`csRsk zsQx_Qj#G|#_#MI#bF7X&ju8!qXvDTp1j8X1J=^>&&Ug?8hgigjg+nZ2v%B;C>+Ma+ zU+ePoaFY}sr@HaCEJ;EQBYGsE#t~