From 7a0667876806010e4174c0130a796f0e2808510d Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 3 Oct 2018 01:19:03 -0400 Subject: [PATCH] Match mus_rg_win_tre.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 4 +- sound/songs/midi/mus_rg_win_tre.mid | Bin 0 -> 11549 bytes sound/songs/mus_rg_win_tre.s | 3186 --------------------------- 5 files changed, 6 insertions(+), 3189 deletions(-) create mode 100644 sound/songs/midi/mus_rg_win_tre.mid delete mode 100644 sound/songs/mus_rg_win_tre.s diff --git a/ld_script.txt b/ld_script.txt index 335bf64a4..387c97fa9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1005,7 +1005,7 @@ SECTIONS { sound/songs/midi/mus_rg_shiruhu.o(.rodata); sound/songs/midi/mus_rg_hanada.o(.rodata); sound/songs/midi/mus_rg_tamamusi.o(.rodata); - sound/songs/mus_rg_win_tre.o(.rodata); + sound/songs/midi/mus_rg_win_tre.o(.rodata); sound/songs/mus_rg_win_yasei.o(.rodata); sound/songs/midi/mus_rg_win_gym.o(.rodata); sound/songs/midi/mus_rg_kuchiba.o(.rodata); diff --git a/songs.mk b/songs.mk index 588c060ca..b5f0c6a60 100644 --- a/songs.mk +++ b/songs.mk @@ -552,6 +552,9 @@ $(MID_SUBDIR)/mus_rg_vs_yasei.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_win_gym.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G171 -V090 +$(MID_SUBDIR)/mus_rg_win_tre.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G169 -V089 + $(MID_SUBDIR)/mus_ropeway.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G071 -V078 diff --git a/sound/song_table.inc b/sound/song_table.inc index 97d10c9d4..3ecfb3617 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -497,7 +497,7 @@ gSongTable:: @ 86B49F0 song mus_rg_title, 0, 0 @ Title Screen (FRLG) song mus_rg_guren, 0, 0 @ Cinnabar Island Theme (FRLG) song mus_rg_shion, 0, 0 @ Lavender Town Theme (FRLG) - song mus_rg_kaihuku, 0, 0 @ Pokémon Healed (2) (FRLG) + song mus_rg_kaihuku, 0, 0 @ Pokémon Healed (FRLG) song mus_rg_cycling, 0, 0 @ Cycling (FRLG) song mus_rg_rocket, 0, 0 @ A Trainer Appears (Bad Guy Version) (FRLG) song mus_rg_shoujo, 0, 0 @ A Trainer Appears (Girl Version) (FRLG) @@ -526,7 +526,7 @@ gSongTable:: @ 86B49F0 song mus_rg_shiruhu, 0, 0 @ Silph Co. (FRLG) song mus_rg_hanada, 0, 0 @ Fuchsia City Theme (FRLG) song mus_rg_tamamusi, 0, 0 @ Celadon City Theme (FRLG) - song mus_rg_win_tre, 0, 0 @ Victory! Trainer + song mus_rg_win_tre, 0, 0 @ Victory! (Trainer Battle) (FRLG) song mus_rg_win_yasei, 0, 0 @ Victory! Wild Pokémon song mus_rg_win_gym, 0, 0 @ Victory! (Gym Leader Battle) (FRLG) song mus_rg_kuchiba, 0, 0 @ Vermillion City Theme (FRLG) diff --git a/sound/songs/midi/mus_rg_win_tre.mid b/sound/songs/midi/mus_rg_win_tre.mid new file mode 100644 index 0000000000000000000000000000000000000000..26fe06bf01e052b9a242d2b0ed25528012f281d0 GIT binary patch literal 11549 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