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

Match mus_kachi2.mid

Browse Source
This commit is contained in:
Kermalis 2018-09-26 19:48:30 -04:00
parent fbc74f20c3
commit f2bfa4409a
5 changed files with 5 additions and 1075 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ld_script.txt
View File

@ -836,7 +836,7 @@ SECTIONS {
sound/songs/mus_tetsuji.o(.rodata); sound/songs/mus_tetsuji.o(.rodata);
sound/songs/midi/mus_field13.o(.rodata); sound/songs/midi/mus_field13.o(.rodata);
sound/songs/mus_kachi22.o(.rodata); sound/songs/mus_kachi22.o(.rodata);
sound/songs/mus_kachi2.o(.rodata); sound/songs/midi/mus_kachi2.o(.rodata);
sound/songs/mus_kachi3.o(.rodata); sound/songs/mus_kachi3.o(.rodata);
sound/songs/mus_kachi5.o(.rodata); sound/songs/mus_kachi5.o(.rodata);
sound/songs/mus_pcc.o(.rodata); sound/songs/mus_pcc.o(.rodata);

3
songs.mk
View File

@ -204,6 +204,9 @@ $(MID_SUBDIR)/mus_inter_v.s: %.s: %.mid
$(MID_SUBDIR)/mus_kachi1.s: %.s: %.mid $(MID_SUBDIR)/mus_kachi1.s: %.s: %.mid
$(MID) $< $@ -G058 -R$(STD_REVERB) $(MID) $< $@ -G058 -R$(STD_REVERB)
$(MID_SUBDIR)/mus_kachi2.s: %.s: %.mid
$(MID) $< $@ -G025 -R$(STD_REVERB)
$(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

@ -357,7 +357,7 @@ gSongTable:: @ 86B49F0
song mus_tetsuji, 0, 0 @ Littleroot Town Test 'TETSUJI' song mus_tetsuji, 0, 0 @ Littleroot Town Test 'TETSUJI'
song mus_field13, 0, 0 @ Unused - Route 38 song mus_field13, 0, 0 @ Unused - Route 38
song mus_kachi22, 0, 0 @ Wild Pokémon Defeated song mus_kachi22, 0, 0 @ Wild Pokémon Defeated
song mus_kachi2, 0, 0 @ Wild Pokémon Defeated with Intro song mus_kachi2, 0, 0 @ Victory! (Wild Pokémon)
song mus_kachi3, 0, 0 @ Gym Leader Defeated song mus_kachi3, 0, 0 @ Gym Leader Defeated
song mus_kachi5, 0, 0 @ Victory! Elite Four song mus_kachi5, 0, 0 @ Victory! Elite Four
song mus_pcc, 0, 0 @ Crystal - Pokémon Communication Center song mus_pcc, 0, 0 @ Crystal - Pokémon Communication Center

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

Binary file not shown.

1073
sound/songs/mus_kachi2.s
View File

File diff suppressed because it is too large Load Diff