From 8ab0a2aa5f31d386fdb3559420b24c5122f4696d Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Fri, 28 Sep 2018 23:54:02 -0400 Subject: [PATCH] Match mus_p_school.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_p_school.mid | Bin 0 -> 3106 bytes sound/songs/mus_p_school.s | 712 ------------------------------ 5 files changed, 5 insertions(+), 714 deletions(-) create mode 100644 sound/songs/midi/mus_p_school.mid delete mode 100644 sound/songs/mus_p_school.s diff --git a/ld_script.txt b/ld_script.txt index e794c1d13..25ee3c8be 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -918,7 +918,7 @@ SECTIONS { sound/songs/midi/mus_m_dungon.o(.rodata); sound/songs/midi/mus_finecity.o(.rodata); sound/songs/midi/mus_machupi.o(.rodata); - sound/songs/mus_p_school.o(.rodata); + sound/songs/midi/mus_p_school.o(.rodata); sound/songs/midi/mus_dendou.o(.rodata); sound/songs/mus_tonekusa.o(.rodata); sound/songs/midi/mus_maborosi.o(.rodata); diff --git a/songs.mk b/songs.mk index e11765ba0..90e5eb675 100644 --- a/songs.mk +++ b/songs.mk @@ -309,6 +309,9 @@ $(MID_SUBDIR)/mus_odamaki.s: %.s: %.mid $(MID_SUBDIR)/mus_ooame.s: %.s: %.mid $(MID) $< $@ -G089 -R$(STD_REVERB) -V080 +$(MID_SUBDIR)/mus_p_school.s: %.s: %.mid + $(MID) $< $@ -G081 -R$(STD_REVERB) -V100 + $(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 832071701..d60c329d0 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -439,7 +439,7 @@ gSongTable:: @ 86B49F0 song mus_m_dungon, 0, 0 @ Mt. Pyre song mus_finecity, 0, 0 @ Slateport City song mus_machupi, 0, 0 @ Mt. Pyre Exterior - song mus_p_school, 0, 0 @ Pokémon Trainer's School + song mus_p_school, 0, 0 @ Trainers' School song mus_dendou, 0, 0 @ The Hall of Fame song mus_tonekusa, 0, 0 @ Fallarbor Town song mus_maborosi, 0, 0 @ Sealed Chamber diff --git a/sound/songs/midi/mus_p_school.mid b/sound/songs/midi/mus_p_school.mid new file mode 100644 index 0000000000000000000000000000000000000000..55651dea57ca3f3532cae884bbb9cfc56c55c35d GIT binary patch literal 3106 zcmdT`%W4x*82+adPeigB6te2dUDL*t&{?#P!%6)C=!2Tuk6JS<7^{inB=zOO#|(zt8_o8m37 z1>OQ*Mg@Hj`fB02a3wz+xk@~a>QT>Eqn=1~20R1yfqhXqH1g~EW#~&ZgxwH!C%_Z% zWj&SpCmQ*6{c@5=06zizb%9;@Th>#lf1;7w^at=WfIsF*uIu)qHstL^JQa1oI~lIy zn|Stqxk*0;zKeM5r>WQ2t=l&@osafUKg)fI=d^DB+;slhKj*fpkDL$t8KPey`o+F# zIus_Tv@E_v~8sUow zq-2f4YMQ>phE0)pcNiO|ak@B-H(sBbh_*`m{u6A5Jtn<#bLfYe-(0ELd@av+)@-2m zZzd8VpYWD^*n=S^7f&n%hRFouFWpRzlVJYLllkb$m^@ey^T~6)32{6x-Y9c%eUP7y ze8oMeZ$tc@?)qxHD{6WOJOpk7w==v7Ud`|tcrC;4+P;o_>d5B^cm!m=NY_T5YG5f9&43HOLhYrvYAciBcyemU|jxqwQuhOZ_K@%|ZNiW5BXW;R?EKW~Sr zPVhvW5!bcP`&-wZafx_iOuER&hIoTbI*{8CTQ+G!ZbO?L&uwvePCXmi;`01vJB9vx Jm_z)__6KNd