From a06e2124a103dd25cc9b2358bd9a8eea0ef0f4e7 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 20:16:20 -0400 Subject: [PATCH] Match mus_rg_pokefue.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_pokefue.mid | Bin 0 -> 703 bytes sound/songs/mus_rg_pokefue.s | 305 ---------------------------- 5 files changed, 5 insertions(+), 307 deletions(-) create mode 100644 sound/songs/midi/mus_rg_pokefue.mid delete mode 100644 sound/songs/mus_rg_pokefue.s diff --git a/ld_script.txt b/ld_script.txt index 43d7a1302..3fdd29a06 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1033,7 +1033,7 @@ SECTIONS { sound/songs/midi/mus_rg_nana123.o(.rodata); sound/songs/midi/mus_rg_nana45.o(.rodata); sound/songs/midi/mus_rg_nana67.o(.rodata); - sound/songs/mus_rg_pokefue.o(.rodata); + sound/songs/midi/mus_rg_pokefue.o(.rodata); sound/songs/mus_rg_vs_deo.o(.rodata); sound/songs/mus_rg_vs_myu2.o(.rodata); sound/songs/mus_rg_vs_den.o(.rodata); diff --git a/songs.mk b/songs.mk index b45472da3..0c6fcc01b 100644 --- a/songs.mk +++ b/songs.mk @@ -459,6 +459,9 @@ $(MID_SUBDIR)/mus_rg_p_tower.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_pokecen.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G162 -V096 +$(MID_SUBDIR)/mus_rg_pokefue.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G165 -V048 -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 e874b612d..27c1ffab3 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -554,7 +554,7 @@ gSongTable:: @ 86B49F0 song mus_rg_nana123, 0, 0 @ Sevii Islands: One, Two & Three Islands (FRLG) song mus_rg_nana45, 0, 0 @ Sevii Islands: Four & Five Islands (FRLG) song mus_rg_nana67, 0, 0 @ Sevii Islands: Six & Seven Islands (FRLG) - song mus_rg_pokefue, 2, 2 @ Poké Flute + song mus_rg_pokefue, 2, 2 @ The Poké Flute (FRLG) song mus_rg_vs_deo, 0, 0 @ Battle! Deoxys song mus_rg_vs_myu2, 0, 0 @ Battle! Mewtwo song mus_rg_vs_den, 0, 0 @ Battle! Legendary Birds diff --git a/sound/songs/midi/mus_rg_pokefue.mid b/sound/songs/midi/mus_rg_pokefue.mid new file mode 100644 index 0000000000000000000000000000000000000000..02686a30b5d9942176379343fdfa90c5b42459fb GIT binary patch literal 703 zcmaKq%}T>S6ot~Xm2cRGz;Rf;Q)11yxzV&)XZXabNPrfzEJJgnV#P2io z2OEC1%}iZZ_kP g-wF9_*br}PCH7vk_hAQW%7RuE*XF-mH%%*|8)V*yw*UYD literal 0 HcmV?d00001 diff --git a/sound/songs/mus_rg_pokefue.s b/sound/songs/mus_rg_pokefue.s deleted file mode 100644 index c39e8fc7d..000000000 --- a/sound/songs/mus_rg_pokefue.s +++ /dev/null @@ -1,305 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_rg_pokefue_grp, voicegroup165 - .equ mus_rg_pokefue_pri, 5 - .equ mus_rg_pokefue_rev, reverb_set+50 - .equ mus_rg_pokefue_mvl, 127 - .equ mus_rg_pokefue_key, 0 - .equ mus_rg_pokefue_tbs, 1 - .equ mus_rg_pokefue_exg, 0 - .equ mus_rg_pokefue_cmp, 1 - - .section .rodata - .global mus_rg_pokefue - .align 2 - -@********************** Track 1 **********************@ - -mus_rg_pokefue_1: - .byte KEYSH , mus_rg_pokefue_key+0 - .byte TEMPO , 80*mus_rg_pokefue_tbs/2 - .byte VOICE , 73 - .byte LFOS , 44 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte BEND , c_v+2 - .byte N12 , En4 , v127 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W06 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , Fn4 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W06 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N24 , Gn4 - .byte W12 - .byte MOD , 7 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 18*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 12*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , An4 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W06 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , Gn4 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W06 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N36 , Cn5 - .byte W12 - .byte MOD , 7 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 18*mus_rg_pokefue_mvl/mxv - .byte W06 - .byte W12 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , Dn5 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W06 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , Cn5 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W06 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , Gn4 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W06 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , An4 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W06 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , Fn4 - .byte W06 - .byte MOD , 6 - .byte VOL , 41*mus_rg_pokefue_mvl/mxv - .byte W06 - .byte MOD , 0 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte N48 , Gn4 - .byte W03 - .byte VOL , 31*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 6 - .byte VOL , 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 19*mus_rg_pokefue_mvl/mxv - .byte W06 - .byte 15*mus_rg_pokefue_mvl/mxv - .byte W09 - .byte 11*mus_rg_pokefue_mvl/mxv - .byte W09 - .byte 8*mus_rg_pokefue_mvl/mxv - .byte W15 - .byte MOD , 0 - .byte W72 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte FINE - -@********************** Track 2 **********************@ - -mus_rg_pokefue_2: - .byte KEYSH , mus_rg_pokefue_key+0 - .byte VOICE , 75 - .byte LFOS , 44 - .byte BENDR , 12 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte PAN , c_v+0 - .byte N12 , En3 , v127 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , Fn3 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N24 , Gn3 - .byte W06 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 7 - .byte VOL , 12*mus_rg_pokefue_mvl/mxv - .byte W12 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , An3 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , Gn3 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N36 , Cn4 - .byte W06 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 7 - .byte VOL , 12*mus_rg_pokefue_mvl/mxv - .byte W12 - .byte W12 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , Dn4 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , Cn4 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , Gn3 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , An3 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N12 , Fn3 - .byte W06 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 0 - .byte VOL , 48*mus_rg_pokefue_mvl/mxv - .byte N48 , Gn3 - .byte W03 - .byte VOL , 43*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte MOD , 6 - .byte VOL , 36*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 24*mus_rg_pokefue_mvl/mxv - .byte W03 - .byte 18*mus_rg_pokefue_mvl/mxv - .byte W12 - .byte W24 - .byte MOD , 0 - .byte W72 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte W96 - .byte FINE - -@******************************************************@ - .align 2 - -mus_rg_pokefue: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte mus_rg_pokefue_pri @ Priority - .byte mus_rg_pokefue_rev @ Reverb. - - .word mus_rg_pokefue_grp - - .word mus_rg_pokefue_1 - .word mus_rg_pokefue_2 - - .end