From 1814174d03a8a7a4fea6b1555978a033e464f706 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Fri, 28 Sep 2018 23:46:30 -0400 Subject: [PATCH] Match mus_nibi.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_nibi.mid | Bin 0 -> 5785 bytes sound/songs/mus_nibi.s | 1079 --------------------------------- 5 files changed, 5 insertions(+), 1081 deletions(-) create mode 100644 sound/songs/midi/mus_nibi.mid delete mode 100644 sound/songs/mus_nibi.s diff --git a/ld_script.txt b/ld_script.txt index 829653253..f333ddb9c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -840,7 +840,7 @@ SECTIONS { sound/songs/midi/mus_kachi3.o(.rodata); sound/songs/midi/mus_kachi5.o(.rodata); sound/songs/mus_pcc.o(.rodata); - sound/songs/mus_nibi.o(.rodata); + sound/songs/midi/mus_nibi.o(.rodata); sound/songs/mus_suikun.o(.rodata); sound/songs/midi/mus_dooro1.o(.rodata); sound/songs/midi/mus_dooro_x1.o(.rodata); diff --git a/songs.mk b/songs.mk index 7e69e0a90..2549712d0 100644 --- a/songs.mk +++ b/songs.mk @@ -300,6 +300,9 @@ $(MID_SUBDIR)/mus_mishiro.s: %.s: %.mid $(MID_SUBDIR)/mus_nextroad.s: %.s: %.mid $(MID) $< $@ -G047 -R$(STD_REVERB) -V097 +$(MID_SUBDIR)/mus_nibi.s: %.s: %.mid + $(MID) $< $@ -G000 -R$(STD_REVERB) -V080 + $(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 423c85bfc..659b1ecb6 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -361,7 +361,7 @@ gSongTable:: @ 86B49F0 song mus_kachi3, 0, 0 @ Victory! (Gym Leader) song mus_kachi5, 0, 0 @ Victory! (Wallace) song mus_pcc, 0, 0 @ Crystal - Pokémon Communication Center - song mus_nibi, 0, 0 @ GSC - Viridian/Saffron/Pewter/etc + song mus_nibi, 0, 0 @ Unused - Viridian City song mus_suikun, 0, 0 @ Crystal - Battle! Legendary Beasts song mus_dooro1, 0, 0 @ Route 101 song mus_dooro_x1, 0, 0 @ Route 110 diff --git a/sound/songs/midi/mus_nibi.mid b/sound/songs/midi/mus_nibi.mid new file mode 100644 index 0000000000000000000000000000000000000000..dc0df50f21a83b9a4800bfce871dee8e00c69073 GIT binary patch literal 5785 zcmeH~%T8NY6owZq*~wt51CREIPLPU(1jd1Ib5IZgJC+?AVkJmbXB|}PBO}DysHmS^k)lU!MLb{a2YgdnF~%gCU_$djzF$XP z2M@plQ0=08vi&~%eOc)5XJs&8=ddd!`$(%F<-7h7agMI|KSF*alI)_~LA(ATc!-~U z4TwL;Prb2L|+fvUAkosH2qX38T7{U+C95?yN?<#;H4Nfc4XWo%Czak#F^k z_wB*gT~Bp4Q{A0ZH+`GEZb|bL`X1*Y{VG@mZ7$d681>>@i}{$H&83CBh5Q&l$M|W1 zEl~Heh@3tP_ zF~9fif17x1;*Iy;=%U`)`mc4AQvZCa{^kbb@=P84A`m;`dCihha&oh7i z9QispNpFLGZ;a*;=j55E`SpWcw8g3?}ZGOv0uLW zWF5#~bMhNc){w7Tk6&M)2SY-i_zn#4{gBtR*92=|4OF`*pKQ<9xmTBkVLdB@lI&&3 z*PzGOdC1qI*T#?1=D$2uPxT9X&8MJw&3nB1L%wpoL+Vg0{PSyoJUo1d+<^g=SzTV%*{=|I}_9M>a_Wtly&*yub)qDKPV{byfM_u--3;iBH z@4+q@>385ekY9zlej7V}ov>dakK4vB(rxI7Z^5@#e z$m>%7VR%Bk6Z~8LmY?OT`TLZ=Px^t~tXI3>V37k^BrFYJE%8r*rr;{ruGN9^U-o z9Q;SyGux~G%01kFekJO2GuJok{Ok^`Pu4%<8y0fi`