diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w014.mid | bin | 0 -> 508 bytes | |||
| -rw-r--r-- | sound/songs/se_w014.s | 211 |
4 files changed, 4 insertions, 212 deletions
diff --git a/ld_script.txt b/ld_script.txt index 67a3a256b..5123732a2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -825,7 +825,7 @@ SECTIONS { sound/songs/se_w122.o(.rodata); sound/songs/se_w060.o(.rodata); sound/songs/se_w185.o(.rodata); - sound/songs/se_w014.o(.rodata); + sound/songs/midi/se_w014.o(.rodata); sound/songs/se_w043.o(.rodata); sound/songs/se_w207.o(.rodata); sound/songs/se_w207b.o(.rodata); @@ -1212,5 +1212,8 @@ $(MID_SUBDIR)/se_w013.s: %.s: %.mid $(MID_SUBDIR)/se_w013b.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 +$(MID_SUBDIR)/se_w014.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_w014.mid b/sound/songs/midi/se_w014.mid Binary files differnew file mode 100644 index 000000000..8b17c79a9 --- /dev/null +++ b/sound/songs/midi/se_w014.mid diff --git a/sound/songs/se_w014.s b/sound/songs/se_w014.s deleted file mode 100644 index 4d712bd00..000000000 --- a/sound/songs/se_w014.s +++ /dev/null @@ -1,211 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w014_grp, voicegroup128 - .equ se_w014_pri, 4 - .equ se_w014_rev, reverb_set+50 - .equ se_w014_mvl, 127 - .equ se_w014_key, 0 - .equ se_w014_tbs, 1 - .equ se_w014_exg, 0 - .equ se_w014_cmp, 1 - - .section .rodata - .global se_w014 - .align 2 - -@********************** Track 1 **********************@ - -se_w014_1: - .byte KEYSH , se_w014_key+0 - .byte TEMPO , 150*se_w014_tbs/2 - .byte VOICE , 28 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 100*se_w014_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Fn5 , v100 - .byte W01 - .byte PAN , c_v-6 - .byte N01 , Fs5 , v088 - .byte W01 - .byte PAN , c_v+5 - .byte N01 , Gn5 - .byte W01 - .byte PAN , c_v+0 - .byte N01 , Fs5 - .byte W01 - .byte N14 , Gn5 , v100 - .byte W02 - .byte PAN , c_v-4 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+5 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 95*se_w014_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 92*se_w014_mvl/mxv - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 87*se_w014_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 79*se_w014_mvl/mxv - .byte PAN , c_v-4 - .byte W01 - .byte VOL , 66*se_w014_mvl/mxv - .byte PAN , c_v+0 - .byte W02 - .byte VOL , 58*se_w014_mvl/mxv - .byte W01 - .byte VOICE , 22 - .byte VOL , 100*se_w014_mvl/mxv - .byte N10 , Cn4 , v092 - .byte W01 - .byte BEND , c_v+3 - .byte W01 - .byte c_v+5 - .byte W01 - .byte PAN , c_v-1 - .byte BEND , c_v+7 - .byte W02 - .byte VOL , 96*se_w014_mvl/mxv - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 90*se_w014_mvl/mxv - .byte PAN , c_v-3 - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 84*se_w014_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte VOL , 70*se_w014_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v+26 - .byte W01 - .byte VOL , 61*se_w014_mvl/mxv - .byte BEND , c_v+32 - .byte W03 - .byte VOL , 100*se_w014_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N10 - .byte W01 - .byte BEND , c_v+3 - .byte W01 - .byte c_v+5 - .byte W01 - .byte PAN , c_v+2 - .byte BEND , c_v+7 - .byte W02 - .byte VOL , 96*se_w014_mvl/mxv - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 90*se_w014_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 84*se_w014_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte VOL , 70*se_w014_mvl/mxv - .byte PAN , c_v+7 - .byte BEND , c_v+26 - .byte W01 - .byte VOL , 61*se_w014_mvl/mxv - .byte BEND , c_v+32 - .byte W03 - .byte VOL , 100*se_w014_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N16 - .byte W01 - .byte BEND , c_v+3 - .byte W01 - .byte c_v+5 - .byte W01 - .byte PAN , c_v+3 - .byte BEND , c_v+7 - .byte W02 - .byte VOL , 96*se_w014_mvl/mxv - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 90*se_w014_mvl/mxv - .byte PAN , c_v-2 - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 84*se_w014_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte VOL , 70*se_w014_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+26 - .byte W01 - .byte VOL , 61*se_w014_mvl/mxv - .byte BEND , c_v+32 - .byte W02 - .byte VOL , 56*se_w014_mvl/mxv - .byte PAN , c_v-4 - .byte BEND , c_v+36 - .byte W01 - .byte VOL , 48*se_w014_mvl/mxv - .byte BEND , c_v+42 - .byte W01 - .byte VOL , 37*se_w014_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+48 - .byte W01 - .byte VOL , 25*se_w014_mvl/mxv - .byte BEND , c_v+56 - .byte W01 - .byte VOL , 11*se_w014_mvl/mxv - .byte PAN , c_v-11 - .byte BEND , c_v+63 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_w014_2: - .byte KEYSH , se_w014_key+0 - .byte VOICE , 25 - .byte VOL , 100*se_w014_mvl/mxv - .byte N04 , Cn3 , v040 - .byte W04 - .byte N14 , Gs4 - .byte W08 - .byte VOL , 89*se_w014_mvl/mxv - .byte W01 - .byte 72*se_w014_mvl/mxv - .byte W01 - .byte 46*se_w014_mvl/mxv - .byte W01 - .byte 25*se_w014_mvl/mxv - .byte W01 - .byte 11*se_w014_mvl/mxv - .byte W08 - .byte W12 - .byte W12 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_w014: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w014_pri @ Priority - .byte se_w014_rev @ Reverb. - - .word se_w014_grp - - .word se_w014_1 - .word se_w014_2 - - .end |