From 08715af6ac719f34b062f637475d8139250baf25 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 25 Sep 2018 16:28:35 -0400 Subject: [PATCH] Match mus_battle20.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_battle20.mid | Bin 0 -> 15959 bytes sound/songs/mus_battle20.s | 3176 ----------------------------- 5 files changed, 5 insertions(+), 3178 deletions(-) create mode 100644 sound/songs/midi/mus_battle20.mid delete mode 100644 sound/songs/mus_battle20.s diff --git a/ld_script.txt b/ld_script.txt index 232883880..daa74d14f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -959,7 +959,7 @@ SECTIONS { sound/songs/midi/mus_b_dome1.o(.rodata); sound/songs/mus_battle27.o(.rodata); sound/songs/mus_battle31.o(.rodata); - sound/songs/mus_battle20.o(.rodata); + sound/songs/midi/mus_battle20.o(.rodata); sound/songs/mus_battle32.o(.rodata); sound/songs/mus_battle33.o(.rodata); sound/songs/mus_battle36.o(.rodata); diff --git a/songs.mk b/songs.mk index c1571a114..14f0fe509 100644 --- a/songs.mk +++ b/songs.mk @@ -39,6 +39,9 @@ $(MID_SUBDIR)/mus_b_tower.s: %.s: %.mid $(MID_SUBDIR)/mus_b_tube.s: %.s: %.mid $(MID) $< $@ -G112 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_battle20.s: %.s: %.mid + $(MID) $< $@ -G119 -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 ddfe447e6..b27767e31 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -480,7 +480,7 @@ gSongTable:: @ 86B49F0 song mus_b_dome1, 0, 0 @ Battle Dome Lobby song mus_battle27, 0, 0 @ Battle! Wild Pokémon song mus_battle31, 0, 0 @ Battle! Team Aqua/Magma - song mus_battle20, 0, 0 @ Battle! Trainer + 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_battle36, 0, 0 @ Battle! Regi Trio diff --git a/sound/songs/midi/mus_battle20.mid b/sound/songs/midi/mus_battle20.mid new file mode 100644 index 0000000000000000000000000000000000000000..6c7496c864546dcf560a66c219cb62b882da3e1d GIT binary patch literal 15959 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