From 4dae35485867b75b8c33c629290de063de2e5f9d Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Mon, 1 Oct 2018 14:59:38 -0400 Subject: [PATCH] Match mus_me_rg_photo.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_me_rg_photo.mid | Bin 0 -> 841 bytes sound/songs/mus_me_rg_photo.s | 258 --------------------------- 5 files changed, 5 insertions(+), 260 deletions(-) create mode 100644 sound/songs/midi/mus_me_rg_photo.mid delete mode 100644 sound/songs/mus_me_rg_photo.s diff --git a/ld_script.txt b/ld_script.txt index 19bc3bb016..7775643f1d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1015,7 +1015,7 @@ SECTIONS { sound/songs/mus_rg_fan2.o(.rodata); sound/songs/mus_rg_fan5.o(.rodata); sound/songs/mus_rg_fan6.o(.rodata); - sound/songs/mus_me_rg_photo.o(.rodata); + sound/songs/midi/mus_me_rg_photo.o(.rodata); sound/songs/mus_rg_titlerog.o(.rodata); sound/songs/mus_rg_get_yasei.o(.rodata); sound/songs/mus_rg_sousa.o(.rodata); diff --git a/songs.mk b/songs.mk index c67aa63929..7968f4e080 100644 --- a/songs.mk +++ b/songs.mk @@ -267,6 +267,9 @@ $(MID_SUBDIR)/mus_me_kinomi.s: %.s: %.mid $(MID_SUBDIR)/mus_me_pointget.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G103 -V090 -P5 +$(MID_SUBDIR)/mus_me_rg_photo.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G180 -V100 -P5 + $(MID_SUBDIR)/mus_me_shinka.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G026 -V080 diff --git a/sound/song_table.inc b/sound/song_table.inc index 8ea7eebe02..41a9353695 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -537,7 +537,7 @@ gSongTable:: @ 86B49F0 song mus_rg_fan2, 2, 2 @ Fanfare 2 song mus_rg_fan5, 2, 2 @ Obtained a Starter! song mus_rg_fan6, 2, 2 @ Pokémon Caught! (Used in Emerald) - song mus_me_rg_photo, 2, 2 @ Trainer Photo + song mus_me_rg_photo, 2, 2 @ Pokémon Printer (FRLG) song mus_rg_titlerog, 0, 0 @ Game Freak song mus_rg_get_yasei, 0, 0 @ Pokémon Caught Victory Theme song mus_rg_sousa, 0, 0 @ Starting Tutorial diff --git a/sound/songs/midi/mus_me_rg_photo.mid b/sound/songs/midi/mus_me_rg_photo.mid new file mode 100644 index 0000000000000000000000000000000000000000..76fce4af3047a7d4a37b14fe6cde19de366d5bbb GIT binary patch literal 841 zcmY+CPfHs?9ERV`#_qOI2=uatC^?nTOFeqgXq5=YD29+!{6isy7J4bAhn^Z|^#eGY zd=RyMfZF;&YD+&y`pjg|=CJ$Yd3Of(d1u<)_irUVQpA(ByPrNl&op^mj!Ido$zEK( zz1HNV!l%Fb9_eBs)qJXj$L{@PRmnU3(kq>}HsX_(biP%KPqvtCxXoG3_op=HOSsGvIg0EM%Ex}ku^wJWc@y54H6bvpCfCK zwa6M|EwTnFi>zOVtU=Zy>vLocvKCpNBRl1K;A-G3a3yf+`7$YG5660^A7x$5n7&cc zQqkCm^M+Kc)Z%=FxdyK>8?ejQ;dPh8E^oq3m%}dSO60UrG+~!>C34y*Xf3C;f);aH zENIQIqotgd3R?0xE#