From adcd05f1764ee6ff2cfc3015475101a46469e6f1 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 21:16:29 -0400 Subject: [PATCH] Match mus_rg_seibetu.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_seibetu.mid | Bin 0 -> 374 bytes sound/songs/mus_rg_seibetu.s | 156 ---------------------------- 5 files changed, 5 insertions(+), 158 deletions(-) create mode 100644 sound/songs/midi/mus_rg_seibetu.mid delete mode 100644 sound/songs/mus_rg_seibetu.s diff --git a/ld_script.txt b/ld_script.txt index e4ea86857..0f2ea5674 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1020,7 +1020,7 @@ SECTIONS { 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/mus_rg_seibetu.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); sound/songs/midi/mus_rg_network.o(.rodata); diff --git a/songs.mk b/songs.mk index 6147f057d..1b2ebe632 100644 --- a/songs.mk +++ b/songs.mk @@ -480,6 +480,9 @@ $(MID_SUBDIR)/mus_rg_rocket.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_santoan.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G163 -V090 +$(MID_SUBDIR)/mus_rg_seibetu.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 38c938906..441304fc0 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -541,7 +541,7 @@ gSongTable:: @ 86B49F0 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_seibetu, 0, 0 @ Starting Tutorial 3 + 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 song mus_rg_network, 0, 0 @ Pokémon Net Center (FRLG) diff --git a/sound/songs/midi/mus_rg_seibetu.mid b/sound/songs/midi/mus_rg_seibetu.mid new file mode 100644 index 0000000000000000000000000000000000000000..8c0a1d7ea5e107ae224d74c747dfdd709c327841 GIT binary patch literal 374 zcmeYb$w*;fU|?flWZ+k77JYgBWN=re4As9~>V;Bu0fVqU@DV$NWR zFvo!5XduH@pc*+223a96DFAXmyC=xrsX%*MwHO$tYFDteY9pH+$#9H;VH?oYX&M#G ZZ5j+f+JH>Dg26I@4QPaxC4&UeVF2idPkjIY literal 0 HcmV?d00001 diff --git a/sound/songs/mus_rg_seibetu.s b/sound/songs/mus_rg_seibetu.s deleted file mode 100644 index a0987d26d..000000000 --- a/sound/songs/mus_rg_seibetu.s +++ /dev/null @@ -1,156 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_rg_seibetu_grp, voicegroup182 - .equ mus_rg_seibetu_pri, 0 - .equ mus_rg_seibetu_rev, reverb_set+50 - .equ mus_rg_seibetu_mvl, 127 - .equ mus_rg_seibetu_key, 0 - .equ mus_rg_seibetu_tbs, 1 - .equ mus_rg_seibetu_exg, 0 - .equ mus_rg_seibetu_cmp, 1 - - .section .rodata - .global mus_rg_seibetu - .align 2 - -@********************** Track 1 **********************@ - -mus_rg_seibetu_1: - .byte KEYSH , mus_rg_seibetu_key+0 - .byte TEMPO , 120*mus_rg_seibetu_tbs/2 - .byte VOICE , 56 - .byte LFOS , 44 - .byte BENDR , 12 - .byte PAN , c_v+28 - .byte VOL , 67*mus_rg_seibetu_mvl/mxv - .byte W24 - .byte N06 , Gn3 , v120 - .byte W24 - .byte W48 - .byte FINE - -@********************** Track 2 **********************@ - -mus_rg_seibetu_2: - .byte KEYSH , mus_rg_seibetu_key+0 - .byte VOICE , 60 - .byte LFOS , 44 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 81*mus_rg_seibetu_mvl/mxv - .byte W24 - .byte N06 , Bn3 , v120 - .byte W24 - .byte W48 - .byte FINE - -@********************** Track 3 **********************@ - -mus_rg_seibetu_3: - .byte KEYSH , mus_rg_seibetu_key+0 - .byte VOICE , 58 - .byte BENDR , 12 - .byte LFOS , 44 - .byte VOL , 88*mus_rg_seibetu_mvl/mxv - .byte PAN , c_v+0 - .byte N24 , Fs1 , v120 - .byte W48 - .byte W48 - .byte FINE - -@********************** Track 4 **********************@ - -mus_rg_seibetu_4: - .byte KEYSH , mus_rg_seibetu_key+0 - .byte VOICE , 48 - .byte LFOS , 44 - .byte BENDR , 12 - .byte PAN , c_v-24 - .byte VOL , 67*mus_rg_seibetu_mvl/mxv - .byte W24 - .byte N06 , Bn2 , v120 - .byte W24 - .byte W48 - .byte FINE - -@********************** Track 5 **********************@ - -mus_rg_seibetu_5: - .byte KEYSH , mus_rg_seibetu_key+0 - .byte VOICE , 47 - .byte LFOS , 44 - .byte BENDR , 12 - .byte VOL , 86*mus_rg_seibetu_mvl/mxv - .byte PAN , c_v+2 - .byte W24 - .byte N15 , Gn2 , v120 - .byte W24 - .byte W48 - .byte FINE - -@********************** Track 6 **********************@ - -mus_rg_seibetu_6: - .byte KEYSH , mus_rg_seibetu_key+0 - .byte VOICE , 81 - .byte LFOS , 44 - .byte XCMD , xIECV , 18 - .byte xIECV , 16 - .byte BENDR , 12 - .byte VOL , 50*mus_rg_seibetu_mvl/mxv - .byte PAN , c_v+0 - .byte N24 , Fs1 , v120 - .byte W24 - .byte N06 , Gn1 - .byte W24 - .byte W48 - .byte FINE - -@********************** Track 7 **********************@ - -mus_rg_seibetu_7: - .byte KEYSH , mus_rg_seibetu_key+0 - .byte VOICE , 0 - .byte VOL , 86*mus_rg_seibetu_mvl/mxv - .byte N03 , En1 , v120 - .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 N48 , An2 , v096 - .byte W24 - .byte W48 - .byte FINE - -@******************************************************@ - .align 2 - -mus_rg_seibetu: - .byte 7 @ NumTrks - .byte 0 @ NumBlks - .byte mus_rg_seibetu_pri @ Priority - .byte mus_rg_seibetu_rev @ Reverb. - - .word mus_rg_seibetu_grp - - .word mus_rg_seibetu_1 - .word mus_rg_seibetu_2 - .word mus_rg_seibetu_3 - .word mus_rg_seibetu_4 - .word mus_rg_seibetu_5 - .word mus_rg_seibetu_6 - .word mus_rg_seibetu_7 - - .end