diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w015.mid | bin | 0 -> 247 bytes | |||
| -rw-r--r-- | sound/songs/se_w015.s | 104 |
4 files changed, 4 insertions, 105 deletions
diff --git a/ld_script.txt b/ld_script.txt index 5123732a2..7337b6b1d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -762,7 +762,7 @@ SECTIONS { sound/songs/se_w145b.o(.rodata); sound/songs/se_w145c.o(.rodata); sound/songs/se_w240.o(.rodata); - sound/songs/se_w015.o(.rodata); + sound/songs/midi/se_w015.o(.rodata); sound/songs/se_w081.o(.rodata); sound/songs/se_w081b.o(.rodata); sound/songs/se_w088.o(.rodata); @@ -1215,5 +1215,8 @@ $(MID_SUBDIR)/se_w013b.s: %.s: %.mid $(MID_SUBDIR)/se_w014.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_w015.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_w015.mid b/sound/songs/midi/se_w015.mid Binary files differnew file mode 100644 index 000000000..2f1b4e059 --- /dev/null +++ b/sound/songs/midi/se_w015.mid diff --git a/sound/songs/se_w015.s b/sound/songs/se_w015.s deleted file mode 100644 index 65397786a..000000000 --- a/sound/songs/se_w015.s +++ /dev/null @@ -1,104 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w015_grp, voicegroup128 - .equ se_w015_pri, 4 - .equ se_w015_rev, reverb_set+50 - .equ se_w015_mvl, 127 - .equ se_w015_key, 0 - .equ se_w015_tbs, 1 - .equ se_w015_exg, 0 - .equ se_w015_cmp, 1 - - .section .rodata - .global se_w015 - .align 2 - -@********************** Track 1 **********************@ - -se_w015_1: - .byte KEYSH , se_w015_key+0 - .byte TEMPO , 220*se_w015_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 120*se_w015_mvl/mxv - .byte BEND , c_v+0 - .byte N15 , Cn3 , v108 - .byte W03 - .byte VOL , 102*se_w015_mvl/mxv - .byte BEND , c_v+22 - .byte W02 - .byte c_v+8 - .byte W01 - .byte VOL , 88*se_w015_mvl/mxv - .byte W03 - .byte 75*se_w015_mvl/mxv - .byte BEND , c_v-13 - .byte W03 - .byte VOL , 55*se_w015_mvl/mxv - .byte W03 - .byte VOICE , 18 - .byte VOL , 120*se_w015_mvl/mxv - .byte PAN , c_v+14 - .byte BEND , c_v+0 - .byte N09 , Cn5 , v092 - .byte W03 - .byte PAN , c_v-15 - .byte BEND , c_v-32 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+28 - .byte W03 - .byte VOICE , 2 - .byte BEND , c_v-64 - .byte N21 , Cn3 , v108 - .byte W03 - .byte BEND , c_v-55 - .byte W03 - .byte PAN , c_v+4 - .byte BEND , c_v-45 - .byte W03 - .byte PAN , c_v-5 - .byte BEND , c_v+30 - .byte W03 - .byte PAN , c_v+15 - .byte BEND , c_v+39 - .byte W03 - .byte PAN , c_v-15 - .byte BEND , c_v+54 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_w015_2: - .byte KEYSH , se_w015_key+0 - .byte VOICE , 5 - .byte PAN , c_v+0 - .byte VOL , 120*se_w015_mvl/mxv - .byte N15 , Cn2 , v040 - .byte W15 - .byte N06 , Fs3 - .byte W09 - .byte N24 , Gs3 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_w015: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w015_pri @ Priority - .byte se_w015_rev @ Reverb. - - .word se_w015_grp - - .word se_w015_1 - .word se_w015_2 - - .end |