From e6a678abf7ab8b7509651baa62af925f3d7e7e30 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 21:18:48 -0400 Subject: [PATCH] Match mus_rg_sekaikan.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_sekaikan.mid | Bin 0 -> 1464 bytes sound/songs/mus_rg_sekaikan.s | 405 --------------------------- 5 files changed, 5 insertions(+), 407 deletions(-) create mode 100644 sound/songs/midi/mus_rg_sekaikan.mid delete mode 100644 sound/songs/mus_rg_sekaikan.s diff --git a/ld_script.txt b/ld_script.txt index 0f2ea5674..c05d14362 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1019,7 +1019,7 @@ SECTIONS { sound/songs/mus_rg_titlerog.o(.rodata); sound/songs/midi/mus_rg_get_yasei.o(.rodata); sound/songs/mus_rg_sousa.o(.rodata); - sound/songs/mus_rg_sekaikan.o(.rodata); + sound/songs/midi/mus_rg_sekaikan.o(.rodata); sound/songs/midi/mus_rg_seibetu.o(.rodata); sound/songs/midi/mus_rg_jump.o(.rodata); sound/songs/mus_rg_union.o(.rodata); diff --git a/songs.mk b/songs.mk index 1b2ebe632..657ee5204 100644 --- a/songs.mk +++ b/songs.mk @@ -483,6 +483,9 @@ $(MID_SUBDIR)/mus_rg_santoan.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_seibetu.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G182 -V088 +$(MID_SUBDIR)/mus_rg_sekaikan.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G182 -V088 + $(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 441304fc0..5b02ae802 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -540,7 +540,7 @@ gSongTable:: @ 86B49F0 song mus_rg_titlerog, 0, 0 @ Game Freak song mus_rg_get_yasei, 0, 0 @ Fanfare: Pokémon Caught (No Intro) (FRLG) song mus_rg_sousa, 0, 0 @ Starting Tutorial - song mus_rg_sekaikan, 0, 0 @ Starting Tutorial 2 + song mus_rg_sekaikan, 0, 0 @ Game Tutorial (2) (FRLG) song mus_rg_seibetu, 0, 0 @ Game Tutorial (3) (FRLG) song mus_rg_jump, 0, 0 @ Pokémon Jump (FRLG) song mus_rg_union, 0, 0 @ Union Room diff --git a/sound/songs/midi/mus_rg_sekaikan.mid b/sound/songs/midi/mus_rg_sekaikan.mid new file mode 100644 index 0000000000000000000000000000000000000000..aec6a02403f6aac31ef25f21d7a57f5e2798d0f0 GIT binary patch literal 1464 zcmc&yO-lk%6g}g}dm?WkL&0p42ocd>Tm*)023@sqAqWN0B8UjuwHk=Xv1zYnKcIh5 zS^GYJ*L0u0H;Ls!v)a5f_sl!@-goY;H;)bgFc{#l>&=s6iqZ&o;_;ZBK-e((%_>4> z>;^8Kdk7tZC4uBN_`dIUY94FV;IDP6p53YfnkYvyBaY`X?npyQevYJz zZow0N0XCsYXpW)eGZZsIrqEI-b&}U;b@QI>=ZEoP@?|MscIJFyqF??Ah%ypovclN%rbsFp}{zY2j7L6Bi};8(%-7YDNlg4Lp!6 zoxqAUJX3Obd`qV2(-Z=l0-;H0j-li;6f;7m&{8OMlGkYUX$k>Nf%wJbBi90&!i@QZ z>Pz>l^`fuxMZUxacn2Q&DXw!KyUc+pv=kEGl>Fp>dCwg2#W`_Wy&*5_iHW*%*3tb< ftM_m38~6Jc{rr>n3AHbJfAqe5w?99cBdzWSeIrrh literal 0 HcmV?d00001 diff --git a/sound/songs/mus_rg_sekaikan.s b/sound/songs/mus_rg_sekaikan.s deleted file mode 100644 index 3312b0eff..000000000 --- a/sound/songs/mus_rg_sekaikan.s +++ /dev/null @@ -1,405 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_rg_sekaikan_grp, voicegroup182 - .equ mus_rg_sekaikan_pri, 0 - .equ mus_rg_sekaikan_rev, reverb_set+50 - .equ mus_rg_sekaikan_mvl, 127 - .equ mus_rg_sekaikan_key, 0 - .equ mus_rg_sekaikan_tbs, 1 - .equ mus_rg_sekaikan_exg, 0 - .equ mus_rg_sekaikan_cmp, 1 - - .section .rodata - .global mus_rg_sekaikan - .align 2 - -@********************** Track 1 **********************@ - -mus_rg_sekaikan_1: - .byte KEYSH , mus_rg_sekaikan_key+0 -mus_rg_sekaikan_1_B1: - .byte TEMPO , 120*mus_rg_sekaikan_tbs/2 - .byte VOICE , 56 - .byte LFOS , 44 - .byte BENDR , 12 - .byte PAN , c_v+23 - .byte VOL , 67*mus_rg_sekaikan_mvl/mxv - .byte W96 - .byte W96 - .byte N06 , Gn3 , v120 - .byte W96 - .byte W72 - .byte N24 , Fs3 - .byte W24 - .byte N06 , Gn3 - .byte W96 - .byte W96 - .byte GOTO - .word mus_rg_sekaikan_1_B1 - .byte FINE - -@********************** Track 2 **********************@ - -mus_rg_sekaikan_2: - .byte KEYSH , mus_rg_sekaikan_key+0 -mus_rg_sekaikan_2_B1: - .byte VOICE , 58 - .byte BENDR , 12 - .byte LFOS , 44 - .byte VOL , 88*mus_rg_sekaikan_mvl/mxv - .byte PAN , c_v+0 - .byte N12 , Gn1 , v120 - .byte W36 - .byte N03 - .byte W06 - .byte N03 - .byte W06 - .byte N12 - .byte W48 - .byte N06 - .byte W12 - .byte N06 - .byte W24 - .byte N06 - .byte W06 - .byte N06 - .byte W06 - .byte N06 - .byte W24 - .byte N24 , Fs1 - .byte W24 -mus_rg_sekaikan_2_000: - .byte N12 , Gn1 , v120 - .byte W36 - .byte N03 - .byte W06 - .byte N03 - .byte W06 - .byte N12 - .byte W48 - .byte PEND - .byte N06 - .byte W12 - .byte N06 - .byte W24 - .byte N06 - .byte W06 - .byte N06 - .byte W06 - .byte N06 - .byte W24 - .byte N24 , Dn1 - .byte W24 - .byte PATT - .word mus_rg_sekaikan_2_000 - .byte N06 , Gn1 , v120 - .byte W12 - .byte N06 - .byte W18 - .byte N06 - .byte W12 - .byte N06 - .byte W06 - .byte N12 - .byte W24 - .byte N24 , Dn1 - .byte W24 - .byte GOTO - .word mus_rg_sekaikan_2_B1 - .byte FINE - -@********************** Track 3 **********************@ - -mus_rg_sekaikan_3: - .byte KEYSH , mus_rg_sekaikan_key+0 -mus_rg_sekaikan_3_B1: - .byte VOICE , 48 - .byte LFOS , 44 - .byte BENDR , 12 - .byte PAN , c_v-16 - .byte VOL , 70*mus_rg_sekaikan_mvl/mxv - .byte W96 - .byte W96 - .byte N06 , Bn2 , v120 - .byte W96 - .byte W72 - .byte N24 , As2 - .byte W24 - .byte N06 , Bn2 - .byte W96 - .byte W96 - .byte GOTO - .word mus_rg_sekaikan_3_B1 - .byte FINE - -@********************** Track 4 **********************@ - -mus_rg_sekaikan_4: - .byte KEYSH , mus_rg_sekaikan_key+0 -mus_rg_sekaikan_4_B1: - .byte VOICE , 47 - .byte LFOS , 44 - .byte BENDR , 12 - .byte VOL , 86*mus_rg_sekaikan_mvl/mxv - .byte PAN , c_v+0 - .byte N12 , Gn2 , v120 - .byte W96 - .byte W96 - .byte N12 - .byte W96 - .byte W96 - .byte N12 - .byte W96 - .byte W96 - .byte GOTO - .word mus_rg_sekaikan_4_B1 - .byte FINE - -@********************** Track 5 **********************@ - -mus_rg_sekaikan_5: - .byte KEYSH , mus_rg_sekaikan_key+0 -mus_rg_sekaikan_5_B1: - .byte VOICE , 81 - .byte LFOS , 44 - .byte XCMD , xIECV , 18 - .byte xIECV , 16 - .byte BENDR , 12 - .byte VOL , 50*mus_rg_sekaikan_mvl/mxv - .byte PAN , c_v+0 - .byte N12 , Gn1 , v120 - .byte W36 - .byte N03 - .byte W06 - .byte N03 - .byte W06 - .byte N12 - .byte W48 - .byte N06 - .byte W12 - .byte N06 - .byte W24 - .byte N06 - .byte W06 - .byte N06 - .byte W06 - .byte N06 - .byte W24 - .byte N24 , Fs1 - .byte W24 -mus_rg_sekaikan_5_000: - .byte N12 , Gn1 , v120 - .byte W36 - .byte N03 - .byte W06 - .byte N03 - .byte W06 - .byte N12 - .byte W48 - .byte PEND - .byte N06 - .byte W12 - .byte N06 - .byte W24 - .byte N06 - .byte W06 - .byte N06 - .byte W06 - .byte N06 - .byte W24 - .byte N24 , Dn1 - .byte W24 - .byte PATT - .word mus_rg_sekaikan_5_000 - .byte N06 , Gn1 , v120 - .byte W12 - .byte N06 - .byte W18 - .byte N06 - .byte W12 - .byte N06 - .byte W06 - .byte N12 - .byte W24 - .byte N24 , Dn1 - .byte W24 - .byte GOTO - .word mus_rg_sekaikan_5_B1 - .byte FINE - -@********************** Track 6 **********************@ - -mus_rg_sekaikan_6: - .byte KEYSH , mus_rg_sekaikan_key+0 -mus_rg_sekaikan_6_B1: - .byte VOICE , 0 - .byte VOL , 85*mus_rg_sekaikan_mvl/mxv - .byte N06 , En1 , v120 - .byte W12 - .byte N06 - .byte W24 - .byte N06 - .byte W06 - .byte En1 , v084 - .byte W06 - .byte En1 , v120 - .byte W12 - .byte N06 - .byte W12 - .byte N03 - .byte W03 - .byte En1 , v048 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N06 , En1 , v120 - .byte W12 - .byte N06 - .byte W24 - .byte N06 - .byte W06 - .byte N06 - .byte W06 - .byte N12 - .byte W12 - .byte N06 - .byte W12 - .byte N03 - .byte W03 - .byte En1 , v048 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 -mus_rg_sekaikan_6_000: - .byte N06 , En1 , v120 - .byte W12 - .byte N06 - .byte W24 - .byte N06 - .byte W06 - .byte En1 , v084 - .byte W06 - .byte En1 , v120 - .byte W12 - .byte N06 - .byte W12 - .byte N03 - .byte W03 - .byte En1 , v048 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte PEND - .byte N06 , En1 , v120 - .byte W12 - .byte N06 - .byte W24 - .byte N06 - .byte W06 - .byte N06 - .byte W06 - .byte N06 - .byte W12 - .byte N06 - .byte W12 - .byte N03 - .byte W03 - .byte En1 , v048 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte PATT - .word mus_rg_sekaikan_6_000 - .byte N06 , En1 , v120 - .byte W12 - .byte N06 - .byte W18 - .byte N06 - .byte W12 - .byte N06 - .byte W06 - .byte N06 - .byte W06 - .byte En1 , v084 - .byte W06 - .byte En1 , v120 - .byte W12 - .byte N03 - .byte W03 - .byte En1 , v048 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte N03 - .byte W03 - .byte GOTO - .word mus_rg_sekaikan_6_B1 - .byte FINE - -@******************************************************@ - .align 2 - -mus_rg_sekaikan: - .byte 6 @ NumTrks - .byte 0 @ NumBlks - .byte mus_rg_sekaikan_pri @ Priority - .byte mus_rg_sekaikan_rev @ Reverb. - - .word mus_rg_sekaikan_grp - - .word mus_rg_sekaikan_1 - .word mus_rg_sekaikan_2 - .word mus_rg_sekaikan_3 - .word mus_rg_sekaikan_4 - .word mus_rg_sekaikan_5 - .word mus_rg_sekaikan_6 - - .end