diff --git a/ld_script.txt b/ld_script.txt index 4f5946017..c0397fcfd 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -956,7 +956,7 @@ SECTIONS { sound/songs/mus_vs_rekku.o(.rodata); sound/songs/mus_vs_front.o(.rodata); sound/songs/mus_vs_mew.o(.rodata); - sound/songs/mus_b_dome1.o(.rodata); + sound/songs/midi/mus_b_dome1.o(.rodata); sound/songs/mus_battle27.o(.rodata); sound/songs/mus_battle31.o(.rodata); sound/songs/mus_battle20.o(.rodata); diff --git a/songs.mk b/songs.mk index c33e75d7e..4958b11a5 100644 --- a/songs.mk +++ b/songs.mk @@ -21,6 +21,9 @@ $(MID_SUBDIR)/mus_b_arena.s: %.s: %.mid $(MID_SUBDIR)/mus_b_dome.s: %.s: %.mid $(MID) $< $@ -G111 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_b_dome1.s: %.s: %.mid + $(MID) $< $@ -G111 -R$(STD_REVERB) + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/songs/midi/mus_b_dome1.mid b/sound/songs/midi/mus_b_dome1.mid new file mode 100644 index 000000000..6da3c95ab Binary files /dev/null and b/sound/songs/midi/mus_b_dome1.mid differ diff --git a/sound/songs/mus_b_dome1.s b/sound/songs/mus_b_dome1.s deleted file mode 100644 index 5f6644079..000000000 --- a/sound/songs/mus_b_dome1.s +++ /dev/null @@ -1,386 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_b_dome1_grp, voicegroup111 - .equ mus_b_dome1_pri, 0 - .equ mus_b_dome1_rev, reverb_set+50 - .equ mus_b_dome1_mvl, 127 - .equ mus_b_dome1_key, 0 - .equ mus_b_dome1_tbs, 1 - .equ mus_b_dome1_exg, 0 - .equ mus_b_dome1_cmp, 1 - - .section .rodata - .global mus_b_dome1 - .align 2 - -@********************** Track 1 **********************@ - -mus_b_dome1_1: - .byte KEYSH , mus_b_dome1_key+0 - .byte TEMPO , 144*mus_b_dome1_tbs/2 - .byte VOICE , 0 - .byte PAN , c_v+0 - .byte VOL , 56*mus_b_dome1_mvl/mxv - .byte N06 , Cn1 , v112 - .byte N06 , Fn1 - .byte W24 - .byte Cn1 - .byte N06 , Fn1 - .byte W24 - .byte Dn1 - .byte N06 , Ds1 - .byte W12 - .byte Ds1 , v064 - .byte W12 - .byte Ds1 , v036 - .byte W12 - .byte Ds1 , v028 - .byte N06 , Dn2 , v112 - .byte W06 - .byte N06 - .byte W06 - .byte Cn1 - .byte N12 , Cn2 - .byte W12 - .byte An1 - .byte W12 - .byte N06 , Cn1 - .byte N12 , Gn1 - .byte W12 - .byte Fn1 - .byte W12 - .byte N06 , Dn1 - .byte N06 , Ds1 - .byte W12 - .byte Ds1 , v064 - .byte W12 - .byte Ds1 , v036 - .byte W12 - .byte Ds1 , v028 - .byte W12 -mus_b_dome1_1_000: - .byte N06 , Cn1 , v112 - .byte N06 , Fn1 - .byte W24 - .byte Cn1 - .byte N06 , Fn1 - .byte W24 - .byte Dn1 - .byte N06 , Ds1 - .byte W12 - .byte Ds1 , v064 - .byte W12 - .byte Ds1 , v036 - .byte W12 - .byte Ds1 , v028 - .byte N06 , Dn2 , v112 - .byte W06 - .byte N06 - .byte W06 - .byte PEND - .byte Cn1 - .byte N12 , Cn2 - .byte W12 - .byte N06 , An1 - .byte W06 - .byte N06 - .byte W06 - .byte Cn1 - .byte N12 , Gn1 - .byte W12 - .byte N06 , Fn1 - .byte W06 - .byte N06 - .byte W06 - .byte Cn1 - .byte N36 , Cs2 , v068 - .byte W12 - .byte N06 , Dn1 , v112 - .byte N06 , Ds1 - .byte W12 - .byte Cn1 - .byte N06 , Ds1 , v064 - .byte W12 - .byte Ds1 , v112 - .byte N12 , An2 , v072 - .byte W06 - .byte N06 , Dn1 , v112 - .byte W06 -mus_b_dome1_1_B1: - .byte N06 , Cn1 , v112 - .byte N06 , Fn1 - .byte N24 , Gn2 , v084 - .byte W24 - .byte N06 , Cn1 , v112 - .byte N06 , Fn1 - .byte W24 - .byte Dn1 - .byte N06 , Ds1 - .byte W12 - .byte Ds1 , v064 - .byte N06 , Cn2 , v112 - .byte W12 - .byte Ds1 , v036 - .byte N06 , Bn1 , v112 - .byte W12 - .byte Ds1 , v028 - .byte N06 , Gn1 , v112 - .byte W12 -mus_b_dome1_1_001: - .byte N06 , Cn1 , v112 - .byte N06 , Fn1 - .byte W24 - .byte Cn1 - .byte N06 , Fn1 - .byte W24 - .byte Dn1 - .byte N06 , Ds1 - .byte W12 - .byte Ds1 , v064 - .byte W12 - .byte Ds1 , v036 - .byte W12 - .byte Ds1 , v028 - .byte W12 - .byte PEND - .byte PATT - .word mus_b_dome1_1_000 - .byte N06 , Cn1 , v112 - .byte N12 , Cn2 - .byte W12 - .byte An1 - .byte W12 - .byte N06 , Cn1 - .byte N06 , Dn1 - .byte N12 , Gn1 - .byte N24 , An2 , v072 - .byte W12 - .byte N12 , Fn1 , v112 - .byte W09 - .byte N03 , Dn1 , v072 - .byte W03 - .byte N06 , Dn1 , v112 - .byte N06 , Ds1 - .byte N24 , Cs2 , v076 - .byte W12 - .byte N06 , Cn1 , v112 - .byte N06 , Ds1 , v064 - .byte N12 , Fn1 , v112 - .byte W12 - .byte N06 , Ds1 , v036 - .byte W12 - .byte Dn1 , v112 - .byte N06 , Ds1 - .byte W06 - .byte Dn1 , v068 - .byte W06 - .byte Cn1 , v112 - .byte N06 , Fn1 - .byte W24 - .byte Cn1 - .byte N06 , Fn1 - .byte W24 - .byte Dn1 - .byte N06 , Ds1 - .byte W12 - .byte Ds1 , v064 - .byte N12 , Cn2 , v112 - .byte W12 - .byte N06 , Ds1 , v036 - .byte N12 , Bn1 , v112 - .byte W12 - .byte N06 , Ds1 , v028 - .byte N12 , Gn1 , v112 - .byte W12 - .byte PATT - .word mus_b_dome1_1_001 - .byte PATT - .word mus_b_dome1_1_000 - .byte N06 , Cn1 , v112 - .byte N06 , Cn2 - .byte W12 - .byte An1 - .byte W06 - .byte Cn1 - .byte W06 - .byte N06 - .byte N06 , Dn1 - .byte N12 , Gn1 - .byte N12 , Cs2 , v076 - .byte W12 - .byte N06 , Dn1 , v112 - .byte N12 , An2 , v088 - .byte W06 - .byte N06 , Cn1 , v112 - .byte W06 - .byte N06 - .byte N06 , Fn1 - .byte W06 - .byte Dn1 - .byte W06 - .byte Fn1 - .byte W06 - .byte Cn1 - .byte W06 - .byte Dn1 - .byte N06 , Ds1 - .byte N24 , Gn2 , v084 - .byte W06 - .byte N06 , Cn1 , v112 - .byte W06 - .byte An1 - .byte W06 - .byte Gn1 - .byte W06 - .byte GOTO - .word mus_b_dome1_1_B1 - .byte FINE - -@********************** Track 2 **********************@ - -mus_b_dome1_2: - .byte KEYSH , mus_b_dome1_key+0 - .byte VOICE , 127 - .byte LFOS , 44 - .byte XCMD , xIECV , 18 - .byte xIECV , 16 - .byte BENDR , 12 - .byte VOL , 38*mus_b_dome1_mvl/mxv - .byte PAN , c_v+63 - .byte N01 , Cn5 , v112 - .byte W12 - .byte Cn5 , v032 - .byte W12 - .byte Cn5 , v060 - .byte W12 - .byte Cn5 , v032 - .byte W12 - .byte Cn5 , v060 - .byte W12 - .byte Cn5 , v036 - .byte W12 - .byte Cn5 , v080 - .byte W12 - .byte Cn5 , v048 - .byte W12 -mus_b_dome1_2_000: - .byte N01 , Cn5 , v112 - .byte W12 - .byte Cn5 , v032 - .byte W12 - .byte Cn5 , v060 - .byte W12 - .byte Cn5 , v032 - .byte W12 - .byte Cn5 , v060 - .byte W12 - .byte Cn5 , v032 - .byte W12 - .byte Cn5 , v096 - .byte W24 - .byte PEND -mus_b_dome1_2_001: - .byte N01 , Cn5 , v112 - .byte W12 - .byte Cn5 , v032 - .byte W12 - .byte Cn5 , v060 - .byte W12 - .byte Cn5 , v032 - .byte W12 - .byte Cn5 , v060 - .byte W12 - .byte Cn5 , v032 - .byte W12 - .byte Cn5 , v060 - .byte W12 - .byte Cn5 , v032 - .byte W12 - .byte PEND - .byte PATT - .word mus_b_dome1_2_001 -mus_b_dome1_2_B1: -mus_b_dome1_2_002: - .byte N01 , Cn5 , v112 - .byte W12 - .byte Cn5 , v032 - .byte W12 - .byte Cn5 , v060 - .byte W12 - .byte Cn5 , v032 - .byte W12 - .byte Cn5 , v060 - .byte W12 - .byte Cn5 , v036 - .byte W12 - .byte Cn5 , v080 - .byte W12 - .byte Cn5 , v048 - .byte W12 - .byte PEND - .byte PATT - .word mus_b_dome1_2_000 - .byte PATT - .word mus_b_dome1_2_001 - .byte PATT - .word mus_b_dome1_2_001 - .byte PATT - .word mus_b_dome1_2_002 - .byte PATT - .word mus_b_dome1_2_000 - .byte PATT - .word mus_b_dome1_2_001 - .byte PATT - .word mus_b_dome1_2_001 - .byte GOTO - .word mus_b_dome1_2_B1 - .byte FINE - -@********************** Track 3 **********************@ - -mus_b_dome1_3: - .byte KEYSH , mus_b_dome1_key+0 - .byte VOICE , 126 - .byte LFOS , 44 - .byte BENDR , 12 - .byte VOL , 56*mus_b_dome1_mvl/mxv - .byte PAN , c_v+63 - .byte W96 - .byte W84 - .byte N12 , Gn5 , v064 - .byte W12 - .byte W96 - .byte W96 -mus_b_dome1_3_B1: - .byte W96 - .byte W84 - .byte N12 , Gn5 , v064 - .byte W12 - .byte W96 - .byte W96 - .byte W96 - .byte W84 - .byte N12 - .byte W12 - .byte W96 - .byte W96 - .byte GOTO - .word mus_b_dome1_3_B1 - .byte FINE - -@******************************************************@ - .align 2 - -mus_b_dome1: - .byte 3 @ NumTrks - .byte 0 @ NumBlks - .byte mus_b_dome1_pri @ Priority - .byte mus_b_dome1_rev @ Reverb. - - .word mus_b_dome1_grp - - .word mus_b_dome1_1 - .word mus_b_dome1_2 - .word mus_b_dome1_3 - - .end