From 4249d0d34fe1cd2955896aaf9099eef5304c1cca Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 16:44:58 -0400 Subject: [PATCH] Match mus_battle33.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_battle33.mid | Bin 0 -> 12895 bytes sound/songs/mus_battle33.s | 2886 ----------------------------- 5 files changed, 5 insertions(+), 2888 deletions(-) create mode 100644 sound/songs/midi/mus_battle33.mid delete mode 100644 sound/songs/mus_battle33.s diff --git a/ld_script.txt b/ld_script.txt index 9e2c681a0..62042b535 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -961,7 +961,7 @@ SECTIONS { sound/songs/midi/mus_battle31.o(.rodata); sound/songs/midi/mus_battle20.o(.rodata); sound/songs/midi/mus_battle32.o(.rodata); - sound/songs/mus_battle33.o(.rodata); + sound/songs/midi/mus_battle33.o(.rodata); sound/songs/mus_battle36.o(.rodata); sound/songs/mus_battle34.o(.rodata); sound/songs/mus_battle35.o(.rodata); diff --git a/songs.mk b/songs.mk index b19324285..ad8a4d857 100644 --- a/songs.mk +++ b/songs.mk @@ -54,6 +54,9 @@ $(MID_SUBDIR)/mus_battle31.s: %.s: %.mid $(MID_SUBDIR)/mus_battle32.s: %.s: %.mid $(MID) $< $@ -G120 -R$(STD_REVERB) -P1 +$(MID_SUBDIR)/mus_battle33.s: %.s: %.mid + $(MID) $< $@ -G121 -R$(STD_REVERB) -P1 + $(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 c36916588..c0c6b9d0d 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -482,7 +482,7 @@ gSongTable:: @ 86B49F0 song mus_battle31, 0, 0 @ Battle! (Team Aqua / Team Magma) song mus_battle20, 0, 0 @ Battle! (Trainer Battle) song mus_battle32, 0, 0 @ Battle! (Gym Leader) - song mus_battle33, 0, 0 @ Battle! Champion + song mus_battle33, 0, 0 @ Battle! (Champion Wallace) song mus_battle36, 0, 0 @ Battle! Regi Trio song mus_battle34, 0, 0 @ Battle! Legendary Pokémon (dupe) song mus_battle35, 0, 0 @ Battle! Rival diff --git a/sound/songs/midi/mus_battle33.mid b/sound/songs/midi/mus_battle33.mid new file mode 100644 index 0000000000000000000000000000000000000000..3661de38bb0a4ccacdb0c69eaca994937fe58726 GIT binary patch literal 12895 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