From bcf8104c92e950e259380ec0f41d51ed45e0b753 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Fri, 28 Sep 2018 22:07:26 -0400 Subject: [PATCH] Match mus_me_pointget.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_me_pointget.mid | Bin 0 -> 1918 bytes sound/songs/mus_me_pointget.s | 591 --------------------------- 5 files changed, 5 insertions(+), 593 deletions(-) create mode 100644 sound/songs/midi/mus_me_pointget.mid delete mode 100644 sound/songs/mus_me_pointget.s diff --git a/ld_script.txt b/ld_script.txt index 5ebbaf7bd2..550047f727 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -942,7 +942,7 @@ SECTIONS { sound/songs/midi/mus_end.o(.rodata); sound/songs/midi/mus_b_frontier.o(.rodata); sound/songs/midi/mus_b_arena.o(.rodata); - sound/songs/mus_me_pointget.o(.rodata); + sound/songs/midi/mus_me_pointget.o(.rodata); sound/songs/mus_me_tore_eye.o(.rodata); sound/songs/mus_pyramid.o(.rodata); sound/songs/mus_pyramid_top.o(.rodata); diff --git a/songs.mk b/songs.mk index fbff3ae44b..87f9ddbe3f 100644 --- a/songs.mk +++ b/songs.mk @@ -264,6 +264,9 @@ $(MID_SUBDIR)/mus_me_bachi.s: %.s: %.mid $(MID_SUBDIR)/mus_me_kinomi.s: %.s: %.mid $(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5 +$(MID_SUBDIR)/mus_me_pointget.s: %.s: %.mid + $(MID) $< $@ -G103 -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 5936d27962..24c60cbdf1 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -463,7 +463,7 @@ gSongTable:: @ 86B49F0 song mus_end, 0, 0 @ The End song mus_b_frontier, 0, 0 @ Battle Frontier song mus_b_arena, 0, 0 @ Battle Arena - song mus_me_pointget, 2, 2 @ Obtained Battle Points! + 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 diff --git a/sound/songs/midi/mus_me_pointget.mid b/sound/songs/midi/mus_me_pointget.mid new file mode 100644 index 0000000000000000000000000000000000000000..4a389064724f4a9bbb808f6d3ac3951a6d642339 GIT binary patch literal 1918 zcmc(fO>0v@6o%hB9cHd^z#^>#M9D&-)Ye4oB8rPkAcSfRDUBp_AwfnE+!U8?H2sKO zw)R8!{(-i!(WT$|2l^M>xN_&NzH@t<8UKmyxdeSY%!iv0ml6+P~iRBvxzIZ0mXB0lKbqSv;;m zZnHl&<%)=2hDk-M7&{r8`+>I^>>Qd)q@aT&pKJ8dV4pjQI@aj5QEGa$v z{Xy@p)5&F>PA=t0iOqExfB@ zmnVBT0zUO!Bm(nv+=_*9h(4yR+0|8ezR}l>zGfEEz%Fw<4^Jmu?3RlyOvdVXtd7U( zSfpyB3ua*~4ovXH6MS(m$E@PEuA|$>`z%_~(arM~nDxNQ#Q<2(kvWoQx5#_C&Vel! z;gfDI>oQlthcsRun$z>{L^je^ETtiOcxPkErk184H?oXp8Sf4-r(ab_C_z` ztdBD%!{>1L=MIn%$<16%F6ZErf)oSj;xf`zhxwY>^AvQ-Ea!neUI-mvGgs-TJdq