ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 11:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Match mus_rg_rival2.mid

Browse Source
This commit is contained in:
Kermalis 2018-10-02 20:23:06 -04:00
parent 56be32f90b
commit e951c5f221
5 changed files with 5 additions and 1438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ld_script.txt
View File

@ -1011,7 +1011,7 @@ SECTIONS {
sound/songs/midi/mus_rg_kuchiba.o(.rodata);
sound/songs/midi/mus_rg_nibi.o(.rodata);
sound/songs/midi/mus_rg_rival1.o(.rodata);
sound/songs/mus_rg_rival2.o(.rodata);
sound/songs/midi/mus_rg_rival2.o(.rodata);
sound/songs/midi/mus_rg_fan2.o(.rodata);
sound/songs/midi/mus_rg_fan5.o(.rodata);
sound/songs/midi/mus_rg_fan6.o(.rodata);

3
songs.mk
View File

@ -471,6 +471,9 @@ $(MID_SUBDIR)/mus_rg_purin.s: %.s: %.mid
$(MID_SUBDIR)/mus_rg_rival1.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G174 -V079
$(MID_SUBDIR)/mus_rg_rival2.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G174 -V079
$(MID_SUBDIR)/mus_ropeway.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G071 -V078

2
sound/song_table.inc
View File

@ -532,7 +532,7 @@ gSongTable:: @ 86B49F0
song mus_rg_kuchiba, 0, 0 @ Vermillion City Theme (FRLG)
song mus_rg_nibi, 0, 0 @ Pewter City Theme (FRLG)
song mus_rg_rival1, 0, 0 @ A Rival Appears (FRLG)
song mus_rg_rival2, 0, 0 @ Rival's Exit
song mus_rg_rival2, 0, 0 @ A Rival Appears (No Intro) (FRLG)
song mus_rg_fan2, 2, 2 @ Fanfare: Professor Oak's Evaluation (FRLG)
song mus_rg_fan5, 2, 2 @ Fanfare: Pokémon Obtained (FRLG)
song mus_rg_fan6, 2, 2 @ Fanfare: Pokémon Caught

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

Binary file not shown.

1436
sound/songs/mus_rg_rival2.s
View File

File diff suppressed because it is too large Load Diff