diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w025.mid | bin | 0 -> 320 bytes | |||
| -rw-r--r-- | sound/songs/se_w025.s | 150 |
4 files changed, 4 insertions, 151 deletions
diff --git a/ld_script.txt b/ld_script.txt index ee8306694..9fdb93e40 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -774,7 +774,7 @@ SECTIONS { sound/songs/se_w196.o(.rodata); sound/songs/se_w086.o(.rodata); sound/songs/midi/se_w004.o(.rodata); - sound/songs/se_w025.o(.rodata); + sound/songs/midi/se_w025.o(.rodata); sound/songs/se_w025b.o(.rodata); sound/songs/se_w152.o(.rodata); sound/songs/se_w026.o(.rodata); @@ -1233,5 +1233,8 @@ $(MID_SUBDIR)/se_w019.s: %.s: %.mid $(MID_SUBDIR)/se_w020.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_w025.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_w025.mid b/sound/songs/midi/se_w025.mid Binary files differnew file mode 100644 index 000000000..bcc9590b4 --- /dev/null +++ b/sound/songs/midi/se_w025.mid diff --git a/sound/songs/se_w025.s b/sound/songs/se_w025.s deleted file mode 100644 index c64f21272..000000000 --- a/sound/songs/se_w025.s +++ /dev/null @@ -1,150 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w025_grp, voicegroup128 - .equ se_w025_pri, 4 - .equ se_w025_rev, reverb_set+50 - .equ se_w025_mvl, 127 - .equ se_w025_key, 0 - .equ se_w025_tbs, 1 - .equ se_w025_exg, 0 - .equ se_w025_cmp, 1 - - .section .rodata - .global se_w025 - .align 2 - -@********************** Track 1 **********************@ - -se_w025_1: - .byte KEYSH , se_w025_key+0 - .byte TEMPO , 150*se_w025_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 63*se_w025_mvl/mxv - .byte BEND , c_v-48 - .byte N72 , Fn4 , v108 - .byte W02 - .byte VOL , 68*se_w025_mvl/mxv - .byte BEND , c_v-43 - .byte W01 - .byte PAN , c_v+5 - .byte W01 - .byte BEND , c_v-38 - .byte W02 - .byte PAN , c_v+15 - .byte VOL , 70*se_w025_mvl/mxv - .byte W01 - .byte BEND , c_v-34 - .byte W02 - .byte PAN , c_v+6 - .byte VOL , 75*se_w025_mvl/mxv - .byte BEND , c_v-30 - .byte W03 - .byte PAN , c_v-1 - .byte BEND , c_v-28 - .byte W01 - .byte VOL , 78*se_w025_mvl/mxv - .byte W01 - .byte BEND , c_v-24 - .byte W01 - .byte PAN , c_v-9 - .byte W01 - .byte VOL , 85*se_w025_mvl/mxv - .byte BEND , c_v-21 - .byte W02 - .byte PAN , c_v-15 - .byte W01 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 90*se_w025_mvl/mxv - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v-12 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v-8 - .byte W02 - .byte c_v-3 - .byte W01 - .byte PAN , c_v+5 - .byte W01 - .byte BEND , c_v+2 - .byte W02 - .byte PAN , c_v+15 - .byte W01 - .byte BEND , c_v+5 - .byte W02 - .byte PAN , c_v+6 - .byte BEND , c_v+9 - .byte W03 - .byte PAN , c_v-1 - .byte BEND , c_v+11 - .byte W02 - .byte c_v+14 - .byte W01 - .byte PAN , c_v-9 - .byte W01 - .byte BEND , c_v+19 - .byte W02 - .byte PAN , c_v-15 - .byte W01 - .byte BEND , c_v+23 - .byte W02 - .byte PAN , c_v-9 - .byte BEND , c_v+27 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+29 - .byte W02 - .byte c_v+33 - .byte W01 - .byte PAN , c_v+5 - .byte W01 - .byte BEND , c_v+35 - .byte W02 - .byte VOL , 74*se_w025_mvl/mxv - .byte PAN , c_v+15 - .byte W01 - .byte BEND , c_v+38 - .byte W02 - .byte VOL , 58*se_w025_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v+42 - .byte W03 - .byte VOL , 47*se_w025_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v+45 - .byte W02 - .byte c_v+48 - .byte W01 - .byte VOL , 34*se_w025_mvl/mxv - .byte PAN , c_v-9 - .byte W01 - .byte BEND , c_v+50 - .byte W02 - .byte VOL , 22*se_w025_mvl/mxv - .byte PAN , c_v-15 - .byte W01 - .byte BEND , c_v+54 - .byte W02 - .byte VOL , 6*se_w025_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+58 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_w025: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w025_pri @ Priority - .byte se_w025_rev @ Reverb. - - .word se_w025_grp - - .word se_w025_1 - - .end |