From 33217e04d623eb56255de6ca6803f53f7f6b665d Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 00:39:39 -0400 Subject: [PATCH] Match mus_rg_fan5.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_fan5.mid | Bin 0 -> 968 bytes sound/songs/mus_rg_fan5.s | 416 ------------------------------- 5 files changed, 5 insertions(+), 418 deletions(-) create mode 100644 sound/songs/midi/mus_rg_fan5.mid delete mode 100644 sound/songs/mus_rg_fan5.s diff --git a/ld_script.txt b/ld_script.txt index 6eb9f8920..6d491802c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1013,7 +1013,7 @@ SECTIONS { sound/songs/mus_rg_rival1.o(.rodata); sound/songs/mus_rg_rival2.o(.rodata); sound/songs/midi/mus_rg_fan2.o(.rodata); - sound/songs/mus_rg_fan5.o(.rodata); + sound/songs/midi/mus_rg_fan5.o(.rodata); sound/songs/mus_rg_fan6.o(.rodata); sound/songs/midi/mus_me_rg_photo.o(.rodata); sound/songs/mus_rg_titlerog.o(.rodata); diff --git a/songs.mk b/songs.mk index e907bc222..614527e59 100644 --- a/songs.mk +++ b/songs.mk @@ -366,6 +366,9 @@ $(MID_SUBDIR)/mus_rg_exeye.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_fan2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G175 -V070 -P5 +$(MID_SUBDIR)/mus_rg_fan5.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G178 -V077 -P5 + $(MID_SUBDIR)/mus_ropeway.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G071 -V078 diff --git a/sound/song_table.inc b/sound/song_table.inc index 1505f6700..c0132f756 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -534,7 +534,7 @@ gSongTable:: @ 86B49F0 song mus_rg_rival1, 0, 0 @ Encounter! Rival song mus_rg_rival2, 0, 0 @ Rival's Exit song mus_rg_fan2, 2, 2 @ Fanfare: Professor Oak's Evaluation (FRLG) - song mus_rg_fan5, 2, 2 @ Obtained a Starter! + song mus_rg_fan5, 2, 2 @ Fanfare: Pokémon Obtained (FRLG) song mus_rg_fan6, 2, 2 @ Pokémon Caught! (Used in Emerald) song mus_me_rg_photo, 2, 2 @ Pokémon Printer (FRLG) song mus_rg_titlerog, 0, 0 @ Game Freak diff --git a/sound/songs/midi/mus_rg_fan5.mid b/sound/songs/midi/mus_rg_fan5.mid new file mode 100644 index 0000000000000000000000000000000000000000..e9c01b132b937bf067ffe9ffdefe9cc7c89d2c61 GIT binary patch literal 968 zcmZvaPiqrV6vfYdlgw=&sR&kx3X+W=BD9$PQ^ZzVVk8ZnPOA-Av0y>bjTD#Sq)m(4 zCTZ8ApCC;qxb^SWPvQ57=Oq(b#ntc5J!dY5dtZ6=#U=nB0!6mGy7h`*7tyVxB$XXP zci9{L75hZy^CY@sNF1N=B|z)^b&O`94`Jtg3+xwy;g*f0T3}raylN4K6jBCkS=Ob% zR!acA*e}yprmsw28PXDUy?*VyVPIO4Ho7Q!U-S;dGkR0>hUit%9Ak@)8a*SbQVls% zVFjm>e!$md9QBjhIp{mTzEt$KmtaUCC84R8iguf^>H+nDdO$s(-lwUD?1$`!?1$|4 zX^!+I>T5;vv1mm!5Pcwe&*=0Z<`vOPMlXn-lkGL&$i>C*UomU=mPI>RXaqa%H}Vy` zlLs0zkOE4ii21yyWF6Ow* zbwP|U0*6amVdS5Uy~Xzt948ygL7)50`N*ry1IKp5uol*m&@^Ww@7U(FHVZTt=v#pB zTUd*$6Pjj$8Xrb)MuA#^TA!v_ibiTBjGVl$kNA;Ad~&rn_>H@MY;!nRio9K3j}%e{ zjBP~@N|A{rHMGks#$2zn2ek8;q>z%(#P$&mLTWrHDWnV-+YMKzV|~g~8oe!gjcapH zOpSA%3i=*DfsQ>3ec~TZZFqZA?(?-_EvzM>Ib50WXw$tF;Bac)`J`jFsIMo!9{FES ab0hyVV`jMH-qtPNlovE^SVxiJ-u?jVD$OYX literal 0 HcmV?d00001 diff --git a/sound/songs/mus_rg_fan5.s b/sound/songs/mus_rg_fan5.s deleted file mode 100644 index 175048c1c..000000000 --- a/sound/songs/mus_rg_fan5.s +++ /dev/null @@ -1,416 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_rg_fan5_grp, voicegroup178 - .equ mus_rg_fan5_pri, 5 - .equ mus_rg_fan5_rev, reverb_set+50 - .equ mus_rg_fan5_mvl, 127 - .equ mus_rg_fan5_key, 0 - .equ mus_rg_fan5_tbs, 1 - .equ mus_rg_fan5_exg, 0 - .equ mus_rg_fan5_cmp, 1 - - .section .rodata - .global mus_rg_fan5 - .align 2 - -@********************** Track 1 **********************@ - -mus_rg_fan5_1: - .byte KEYSH , mus_rg_fan5_key+0 - .byte TEMPO , 44*mus_rg_fan5_tbs/2 - .byte VOICE , 80 - .byte LFOS , 44 - .byte BENDR , 12 - .byte VOL , 51*mus_rg_fan5_mvl/mxv - .byte PAN , c_v+0 - .byte W06 - .byte TEMPO , 72*mus_rg_fan5_tbs/2 - .byte c_v-64 - .byte N10 , As3 , v080 - .byte W06 - .byte W03 - .byte PAN , c_v+63 - .byte W01 - .byte N03 , Cn4 - .byte W02 - .byte W03 - .byte N01 - .byte W02 - .byte N01 - .byte W01 - .byte W01 - .byte PAN , c_v-64 - .byte W01 - .byte N10 , Ds4 - .byte W04 - .byte W06 - .byte PAN , c_v+63 - .byte N03 , Fn4 - .byte W05 - .byte N01 - .byte W01 - .byte W01 - .byte MOD , 7 - .byte N01 - .byte W02 - .byte PAN , c_v-64 - .byte W01 - .byte N16 , As4 - .byte W02 - .byte MOD , 5 - .byte W02 - .byte VOL , 46*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 43*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 37*mus_rg_fan5_mvl/mxv - .byte MOD , 3 - .byte W02 - .byte VOL , 34*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 30*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 24*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 19*mus_rg_fan5_mvl/mxv - .byte MOD , 0 - .byte W01 - .byte VOL , 12*mus_rg_fan5_mvl/mxv - .byte W02 - .byte 8*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 4*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 0*mus_rg_fan5_mvl/mxv - .byte W04 - .byte W06 - .byte MOD , 0 - .byte FINE - -@********************** Track 2 **********************@ - -mus_rg_fan5_2: - .byte KEYSH , mus_rg_fan5_key+0 - .byte VOICE , 81 - .byte LFOS , 44 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 76*mus_rg_fan5_mvl/mxv - .byte W06 - .byte N03 , Gn4 , v072 - .byte W05 - .byte N01 - .byte W01 - .byte W01 - .byte N01 - .byte W03 - .byte N10 , Ds4 - .byte W02 - .byte W06 - .byte W02 - .byte N03 , Gs4 - .byte W04 - .byte W01 - .byte N01 - .byte W02 - .byte N01 - .byte W03 - .byte N03 , As4 - .byte W05 - .byte N01 - .byte W01 - .byte W01 - .byte N01 - .byte W03 - .byte VOL , 64*mus_rg_fan5_mvl/mxv - .byte N16 , Ds5 - .byte W02 - .byte VOL , 55*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 53*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 48*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 44*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 40*mus_rg_fan5_mvl/mxv - .byte W02 - .byte 33*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 30*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 24*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 22*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 16*mus_rg_fan5_mvl/mxv - .byte W02 - .byte 15*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 11*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 8*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 0*mus_rg_fan5_mvl/mxv - .byte W03 - .byte W06 - .byte MOD , 0 - .byte FINE - -@********************** Track 3 **********************@ - -mus_rg_fan5_3: - .byte KEYSH , mus_rg_fan5_key+0 - .byte VOICE , 24 - .byte LFOS , 44 - .byte BENDR , 12 - .byte VOL , 77*mus_rg_fan5_mvl/mxv - .byte PAN , c_v-16 - .byte W06 - .byte N10 , Ds2 , v088 - .byte W06 - .byte W04 - .byte Gs2 - .byte W02 - .byte W06 - .byte W02 - .byte PAN , c_v+16 - .byte N10 , Gn2 - .byte W04 - .byte W06 - .byte Fn2 - .byte W06 - .byte W01 - .byte MOD , 7 - .byte W01 - .byte VOL , 69*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 60*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 51*mus_rg_fan5_mvl/mxv - .byte PAN , c_v-16 - .byte N13 , Ds2 , v100 - .byte W02 - .byte VOL , 46*mus_rg_fan5_mvl/mxv - .byte MOD , 5 - .byte W01 - .byte VOL , 38*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 33*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 31*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 28*mus_rg_fan5_mvl/mxv - .byte MOD , 4 - .byte W02 - .byte VOL , 24*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 22*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 18*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 12*mus_rg_fan5_mvl/mxv - .byte MOD , 2 - .byte W01 - .byte VOL , 8*mus_rg_fan5_mvl/mxv - .byte W02 - .byte 0*mus_rg_fan5_mvl/mxv - .byte W02 - .byte MOD , 0 - .byte W04 - .byte W06 - .byte 0 - .byte FINE - -@********************** Track 4 **********************@ - -mus_rg_fan5_4: - .byte KEYSH , mus_rg_fan5_key+0 - .byte VOICE , 13 - .byte LFOS , 44 - .byte BENDR , 12 - .byte PAN , c_v-32 - .byte VOL , 62*mus_rg_fan5_mvl/mxv - .byte W06 - .byte N03 , Gn3 , v127 - .byte W03 - .byte PAN , c_v+32 - .byte W02 - .byte N01 - .byte W01 - .byte W01 - .byte N01 - .byte W03 - .byte N10 , Ds3 - .byte W02 - .byte W01 - .byte PAN , c_v-32 - .byte W05 - .byte W02 - .byte N03 , Gs3 - .byte W04 - .byte PAN , c_v-32 - .byte W01 - .byte N01 - .byte W02 - .byte N01 - .byte W03 - .byte N03 , As3 - .byte W03 - .byte PAN , c_v+32 - .byte W02 - .byte N01 - .byte W01 - .byte W01 - .byte N01 - .byte W03 - .byte N13 , Ds4 - .byte W02 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@********************** Track 5 **********************@ - -mus_rg_fan5_5: - .byte KEYSH , mus_rg_fan5_key+0 - .byte VOICE , 24 - .byte LFOS , 44 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 70*mus_rg_fan5_mvl/mxv - .byte BEND , c_v+1 - .byte W06 - .byte PAN , c_v-32 - .byte N03 , Gn4 , v127 - .byte W05 - .byte N01 - .byte W01 - .byte W01 - .byte N01 - .byte W02 - .byte PAN , c_v+24 - .byte W01 - .byte N10 , Ds4 - .byte W02 - .byte MOD , 4 - .byte W06 - .byte W02 - .byte 0 - .byte PAN , c_v-32 - .byte N03 , Gs4 - .byte W04 - .byte W01 - .byte N01 - .byte W02 - .byte N01 - .byte W03 - .byte PAN , c_v+22 - .byte N03 , As4 - .byte W05 - .byte N01 - .byte W01 - .byte W01 - .byte N01 - .byte W02 - .byte PAN , c_v+32 - .byte W01 - .byte N13 - .byte W02 - .byte W03 - .byte VOL , 57*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 44*mus_rg_fan5_mvl/mxv - .byte W02 - .byte 36*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 25*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 12*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 4*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 1*mus_rg_fan5_mvl/mxv - .byte W02 - .byte W06 - .byte W06 - .byte FINE - -@********************** Track 6 **********************@ - -mus_rg_fan5_6: - .byte KEYSH , mus_rg_fan5_key+0 - .byte VOICE , 0 - .byte PAN , c_v-48 - .byte VOL , 56*mus_rg_fan5_mvl/mxv - .byte W06 - .byte N03 , Fs2 , v096 - .byte W03 - .byte PAN , c_v+48 - .byte W02 - .byte N01 - .byte W01 - .byte W01 - .byte N01 - .byte W03 - .byte N10 , Bn4 , v052 - .byte W02 - .byte W01 - .byte PAN , c_v-48 - .byte W05 - .byte W02 - .byte N03 , Fs2 , v092 - .byte W04 - .byte PAN , c_v+50 - .byte W01 - .byte N01 - .byte W02 - .byte N01 - .byte W03 - .byte N03 - .byte W03 - .byte PAN , c_v-48 - .byte W02 - .byte N01 , Fs2 , v096 - .byte W01 - .byte W01 - .byte N01 - .byte W03 - .byte N14 , Bn4 , v056 - .byte W02 - .byte W06 - .byte W01 - .byte VOL , 44*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 35*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 28*mus_rg_fan5_mvl/mxv - .byte W01 - .byte 8*mus_rg_fan5_mvl/mxv - .byte W02 - .byte 0*mus_rg_fan5_mvl/mxv - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -mus_rg_fan5: - .byte 6 @ NumTrks - .byte 0 @ NumBlks - .byte mus_rg_fan5_pri @ Priority - .byte mus_rg_fan5_rev @ Reverb. - - .word mus_rg_fan5_grp - - .word mus_rg_fan5_1 - .word mus_rg_fan5_2 - .word mus_rg_fan5_3 - .word mus_rg_fan5_4 - .word mus_rg_fan5_5 - .word mus_rg_fan5_6 - - .end