diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/mus_me_kinomi.mid | bin | 0 -> 484 bytes | |||
| -rw-r--r-- | sound/songs/mus_me_kinomi.s | 167 |
4 files changed, 4 insertions, 168 deletions
diff --git a/ld_script.txt b/ld_script.txt index 5e69c9be4..5ebbaf7bd 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -870,7 +870,7 @@ SECTIONS { sound/songs/midi/mus_b_tower.o(.rodata); sound/songs/mus_swimeye.o(.rodata); sound/songs/midi/mus_dan03.o(.rodata); - sound/songs/mus_me_kinomi.o(.rodata); + sound/songs/midi/mus_me_kinomi.o(.rodata); sound/songs/mus_me_tama.o(.rodata); sound/songs/midi/mus_me_b_big.o(.rodata); sound/songs/midi/mus_me_b_small.o(.rodata); @@ -261,6 +261,9 @@ $(MID_SUBDIR)/mus_me_b_small.s: %.s: %.mid $(MID_SUBDIR)/mus_me_bachi.s: %.s: %.mid $(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5 +$(MID_SUBDIR)/mus_me_kinomi.s: %.s: %.mid + $(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5 + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/songs/midi/mus_me_kinomi.mid b/sound/songs/midi/mus_me_kinomi.mid Binary files differnew file mode 100644 index 000000000..30fbd3607 --- /dev/null +++ b/sound/songs/midi/mus_me_kinomi.mid diff --git a/sound/songs/mus_me_kinomi.s b/sound/songs/mus_me_kinomi.s deleted file mode 100644 index bd8696c1d..000000000 --- a/sound/songs/mus_me_kinomi.s +++ /dev/null @@ -1,167 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_me_kinomi_grp, voicegroup012 - .equ mus_me_kinomi_pri, 5 - .equ mus_me_kinomi_rev, reverb_set+50 - .equ mus_me_kinomi_mvl, 127 - .equ mus_me_kinomi_key, 0 - .equ mus_me_kinomi_tbs, 1 - .equ mus_me_kinomi_exg, 0 - .equ mus_me_kinomi_cmp, 1 - - .section .rodata - .global mus_me_kinomi - .align 2 - -@********************** Track 1 **********************@ - -mus_me_kinomi_1: - .byte KEYSH , mus_me_kinomi_key+0 - .byte W12 - .byte TEMPO , 140*mus_me_kinomi_tbs/2 - .byte VOICE , 13 - .byte PAN , c_v-10 - .byte VOL , 90*mus_me_kinomi_mvl/mxv - .byte N04 , Fn4 , v092 - .byte W04 - .byte Fn4 , v080 - .byte W04 - .byte N04 - .byte W04 - .byte Cn4 , v092 - .byte W04 - .byte Cn4 , v080 - .byte W04 - .byte N04 - .byte W04 - .byte Cn5 , v092 - .byte W08 - .byte Dn5 - .byte W08 - .byte Cn5 - .byte W08 - .byte Fn5 - .byte W04 - .byte Fn5 , v080 - .byte W04 - .byte N04 - .byte W04 - .byte N04 - .byte W36 - .byte FINE - -@********************** Track 2 **********************@ - -mus_me_kinomi_2: - .byte KEYSH , mus_me_kinomi_key+0 - .byte W12 - .byte VOICE , 13 - .byte PAN , c_v+31 - .byte VOL , 90*mus_me_kinomi_mvl/mxv - .byte W24 - .byte N04 , Gn4 , v092 - .byte W08 - .byte As4 - .byte W08 - .byte Gn4 - .byte W08 - .byte N16 , An4 - .byte W48 - .byte FINE - -@********************** Track 3 **********************@ - -mus_me_kinomi_3: - .byte KEYSH , mus_me_kinomi_key+0 - .byte W12 - .byte VOICE , 1 - .byte VOL , 90*mus_me_kinomi_mvl/mxv - .byte PAN , c_v-32 - .byte N24 , Fn3 , v080 - .byte W24 - .byte N04 , Gn3 - .byte W08 - .byte N04 - .byte W08 - .byte N04 - .byte W08 - .byte N16 , Fn3 - .byte W48 - .byte FINE - -@********************** Track 4 **********************@ - -mus_me_kinomi_4: - .byte KEYSH , mus_me_kinomi_key+0 - .byte W12 - .byte VOICE , 1 - .byte VOL , 90*mus_me_kinomi_mvl/mxv - .byte PAN , c_v+0 - .byte N24 , An2 , v080 - .byte W24 - .byte N04 , As2 - .byte W08 - .byte N04 - .byte W08 - .byte N04 - .byte W08 - .byte N16 , An2 - .byte W48 - .byte FINE - -@********************** Track 5 **********************@ - -mus_me_kinomi_5: - .byte KEYSH , mus_me_kinomi_key+0 - .byte W12 - .byte VOICE , 100 - .byte VOL , 90*mus_me_kinomi_mvl/mxv - .byte PAN , c_v+0 - .byte N04 , Cn5 , v060 - .byte W08 - .byte PAN , c_v-49 - .byte N04 , Cn5 , v020 - .byte W16 - .byte VOICE , 101 - .byte PAN , c_v-1 - .byte N04 , As3 , v060 - .byte W08 - .byte Gn3 - .byte W08 - .byte PAN , c_v+50 - .byte N04 , Gn3 , v020 - .byte W08 - .byte VOICE , 100 - .byte PAN , c_v+0 - .byte N04 , An3 , v060 - .byte W08 - .byte PAN , c_v-48 - .byte N04 , An3 , v020 - .byte W16 - .byte VOICE , 101 - .byte PAN , c_v+0 - .byte N04 , An3 , v060 - .byte W08 - .byte PAN , c_v+50 - .byte N04 , An3 , v020 - .byte W16 - .byte FINE - -@******************************************************@ - .align 2 - -mus_me_kinomi: - .byte 5 @ NumTrks - .byte 0 @ NumBlks - .byte mus_me_kinomi_pri @ Priority - .byte mus_me_kinomi_rev @ Reverb. - - .word mus_me_kinomi_grp - - .word mus_me_kinomi_1 - .word mus_me_kinomi_2 - .word mus_me_kinomi_3 - .word mus_me_kinomi_4 - .word mus_me_kinomi_5 - - .end |