Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match mus_battle31.mid

This commit is contained in:
Kermalis 2018-09-25 16:40:09 -04:00
parent e1841a111d
commit 425eeb3c07
5 changed files with 5 additions and 3265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ld_script.txt
View File

@ -958,7 +958,7 @@ SECTIONS {
sound/songs/mus_vs_mew.o(.rodata); sound/songs/mus_vs_mew.o(.rodata);
sound/songs/midi/mus_b_dome1.o(.rodata); sound/songs/midi/mus_b_dome1.o(.rodata);
sound/songs/midi/mus_battle27.o(.rodata); sound/songs/midi/mus_battle27.o(.rodata);
sound/songs/mus_battle31.o(.rodata); sound/songs/midi/mus_battle31.o(.rodata);
sound/songs/midi/mus_battle20.o(.rodata); sound/songs/midi/mus_battle20.o(.rodata);
sound/songs/mus_battle32.o(.rodata); sound/songs/mus_battle32.o(.rodata);
sound/songs/mus_battle33.o(.rodata); sound/songs/mus_battle33.o(.rodata);

3
songs.mk
View File

@ -48,6 +48,9 @@ $(MID_SUBDIR)/mus_battle27.s: %.s: %.mid
$(MID_SUBDIR)/mus_battle30.s: %.s: %.mid $(MID_SUBDIR)/mus_battle30.s: %.s: %.mid
$(MID) $< $@ -G126 -R$(STD_REVERB) -P1 $(MID) $< $@ -G126 -R$(STD_REVERB) -P1
$(MID_SUBDIR)/mus_battle31.s: %.s: %.mid
$(MID) $< $@ -G118 -R$(STD_REVERB) -P1
$(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid
$(MID) $< $@ -G017 -R$(STD_REVERB) $(MID) $< $@ -G017 -R$(STD_REVERB)

2
sound/song_table.inc
View File

@ -479,7 +479,7 @@ gSongTable:: @ 86B49F0
song mus_vs_mew, 0, 0 @ Battle! Mew song mus_vs_mew, 0, 0 @ Battle! Mew
song mus_b_dome1, 0, 0 @ Battle Dome Lobby song mus_b_dome1, 0, 0 @ Battle Dome Lobby
song mus_battle27, 0, 0 @ Battle! (Wild Pokémon) song mus_battle27, 0, 0 @ Battle! (Wild Pokémon)
song mus_battle31, 0, 0 @ Battle! Team Aqua/Magma song mus_battle31, 0, 0 @ Battle! (Team Aqua / Team Magma)
song mus_battle20, 0, 0 @ Battle! (Trainer Battle) song mus_battle20, 0, 0 @ Battle! (Trainer Battle)
song mus_battle32, 0, 0 @ Battle! Gym Leader song mus_battle32, 0, 0 @ Battle! Gym Leader
song mus_battle33, 0, 0 @ Battle! Champion song mus_battle33, 0, 0 @ Battle! Champion

BIN
sound/songs/midi/mus_battle31.mid Normal file
View File

Binary file not shown.

3263
sound/songs/mus_battle31.s
View File

File diff suppressed because it is too large Load Diff