diff --git a/ld_script.txt b/ld_script.txt index 550047f727..1b694a0814 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -859,7 +859,7 @@ SECTIONS { sound/songs/midi/mus_bijyutu.o(.rodata); sound/songs/midi/mus_dooro_x4.o(.rodata); sound/songs/midi/mus_fune_kan.o(.rodata); - sound/songs/mus_me_shinka.o(.rodata); + sound/songs/midi/mus_me_shinka.o(.rodata); sound/songs/mus_shinka.o(.rodata); sound/songs/mus_me_wasure.o(.rodata); sound/songs/mus_syoujoeye.o(.rodata); diff --git a/songs.mk b/songs.mk index 87f9ddbe3f..461ee5a889 100644 --- a/songs.mk +++ b/songs.mk @@ -267,6 +267,9 @@ $(MID_SUBDIR)/mus_me_kinomi.s: %.s: %.mid $(MID_SUBDIR)/mus_me_pointget.s: %.s: %.mid $(MID) $< $@ -G103 -R$(STD_REVERB) -V090 -P5 +$(MID_SUBDIR)/mus_me_shinka.s: %.s: %.mid + $(MID) $< $@ -G026 -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 24c60cbdf1..0e32a52890 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -380,7 +380,7 @@ gSongTable:: @ 86B49F0 song mus_bijyutu, 0, 0 @ Museum song mus_dooro_x4, 0, 0 @ Introductions song mus_fune_kan, 0, 0 @ Oceanic Museum - song mus_me_shinka, 2, 2 @ Evolution Intro + song mus_me_shinka, 2, 2 @ Evolution (Intro) song mus_shinka, 0, 0 @ Evolution song mus_me_wasure, 2, 2 @ Move Deleted/Messed Up Appeal song mus_syoujoeye, 0, 0 @ Encounter! Tuber diff --git a/sound/songs/midi/mus_me_shinka.mid b/sound/songs/midi/mus_me_shinka.mid new file mode 100644 index 0000000000..81cd5d041b Binary files /dev/null and b/sound/songs/midi/mus_me_shinka.mid differ diff --git a/sound/songs/mus_me_shinka.s b/sound/songs/mus_me_shinka.s deleted file mode 100644 index 26c136fe4f..0000000000 --- a/sound/songs/mus_me_shinka.s +++ /dev/null @@ -1,94 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_me_shinka_grp, voicegroup026 - .equ mus_me_shinka_pri, 0 - .equ mus_me_shinka_rev, reverb_set+50 - .equ mus_me_shinka_mvl, 127 - .equ mus_me_shinka_key, 0 - .equ mus_me_shinka_tbs, 1 - .equ mus_me_shinka_exg, 0 - .equ mus_me_shinka_cmp, 1 - - .section .rodata - .global mus_me_shinka - .align 2 - -@********************** Track 1 **********************@ - -mus_me_shinka_1: - .byte KEYSH , mus_me_shinka_key+0 - .byte TEMPO , 120*mus_me_shinka_tbs/2 - .byte VOICE , 47 - .byte VOL , 80*mus_me_shinka_mvl/mxv - .byte PAN , c_v-8 - .byte N24 , Dn2 , v127 - .byte W48 - .byte FINE - -@********************** Track 2 **********************@ - -mus_me_shinka_2: - .byte KEYSH , mus_me_shinka_key+0 - .byte VOICE , 80 - .byte VOL , 80*mus_me_shinka_mvl/mxv - .byte XCMD , xIECV , 8 - .byte xIECL , 8 - .byte PAN , c_v+0 - .byte N06 , Gn4 , v080 - .byte W06 - .byte Dn4 - .byte W06 - .byte Gn4 - .byte W06 - .byte Dn4 - .byte W30 - .byte FINE - -@********************** Track 3 **********************@ - -mus_me_shinka_3: - .byte KEYSH , mus_me_shinka_key+0 - .byte VOICE , 82 - .byte XCMD , xIECV , 8 - .byte xIECL , 8 - .byte VOL , 80*mus_me_shinka_mvl/mxv - .byte BEND , c_v+2 - .byte W06 - .byte N06 , Gn4 , v032 - .byte W06 - .byte Dn4 - .byte W06 - .byte Gn4 - .byte W06 - .byte Dn4 - .byte W24 - .byte FINE - -@********************** Track 4 **********************@ - -mus_me_shinka_4: - .byte KEYSH , mus_me_shinka_key+0 - .byte VOICE , 0 - .byte VOL , 80*mus_me_shinka_mvl/mxv - .byte PAN , c_v+23 - .byte N48 , Bn2 , v100 - .byte W48 - .byte FINE - -@******************************************************@ - .align 2 - -mus_me_shinka: - .byte 4 @ NumTrks - .byte 0 @ NumBlks - .byte mus_me_shinka_pri @ Priority - .byte mus_me_shinka_rev @ Reverb. - - .word mus_me_shinka_grp - - .word mus_me_shinka_1 - .word mus_me_shinka_2 - .word mus_me_shinka_3 - .word mus_me_shinka_4 - - .end