diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 17:10:54 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | 4f1ba2c1adb3c5f98ecf0cf669d8c277cbf00f9d (patch) | |
| tree | cddc586d886f45674587b75170b715fcb75a16a4 | |
| parent | b949c7033d5046737599dda7a585f8fea3723291 (diff) | |
Match se_w025b.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w025b.mid | bin | 0 -> 313 bytes | |||
| -rw-r--r-- | sound/songs/se_w025b.s | 128 |
4 files changed, 4 insertions, 129 deletions
diff --git a/ld_script.txt b/ld_script.txt index 9fdb93e40..5613d49f7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -775,7 +775,7 @@ SECTIONS { sound/songs/se_w086.o(.rodata); sound/songs/midi/se_w004.o(.rodata); sound/songs/midi/se_w025.o(.rodata); - sound/songs/se_w025b.o(.rodata); + sound/songs/midi/se_w025b.o(.rodata); sound/songs/se_w152.o(.rodata); sound/songs/se_w026.o(.rodata); sound/songs/se_w172.o(.rodata); @@ -1236,5 +1236,8 @@ $(MID_SUBDIR)/se_w020.s: %.s: %.mid $(MID_SUBDIR)/se_w025.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 +$(MID_SUBDIR)/se_w025b.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_w025b.mid b/sound/songs/midi/se_w025b.mid Binary files differnew file mode 100644 index 000000000..ac165424b --- /dev/null +++ b/sound/songs/midi/se_w025b.mid diff --git a/sound/songs/se_w025b.s b/sound/songs/se_w025b.s deleted file mode 100644 index 03b095e6c..000000000 --- a/sound/songs/se_w025b.s +++ /dev/null @@ -1,128 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w025b_grp, voicegroup128 - .equ se_w025b_pri, 4 - .equ se_w025b_rev, reverb_set+50 - .equ se_w025b_mvl, 127 - .equ se_w025b_key, 0 - .equ se_w025b_tbs, 1 - .equ se_w025b_exg, 0 - .equ se_w025b_cmp, 1 - - .section .rodata - .global se_w025b - .align 2 - -@********************** Track 1 **********************@ - -se_w025b_1: - .byte KEYSH , se_w025b_key+0 - .byte TEMPO , 220*se_w025b_tbs/2 - .byte VOICE , 6 - .byte VOL , 110*se_w025b_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N04 , En3 , v127 - .byte W01 - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v+10 - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v-64 - .byte W03 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , An2 - .byte W01 - .byte PAN , c_v+7 - .byte BEND , c_v-28 - .byte W01 - .byte c_v-64 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N03 , Cn3 , v060 - .byte W01 - .byte PAN , c_v-6 - .byte BEND , c_v-28 - .byte W02 - .byte c_v-64 - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N10 , Gn2 , v127 - .byte W01 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 101*se_w025b_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-15 - .byte W02 - .byte c_v-20 - .byte W01 - .byte VOL , 83*se_w025b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-24 - .byte W01 - .byte c_v-30 - .byte W01 - .byte VOL , 58*se_w025b_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-39 - .byte W01 - .byte c_v-53 - .byte W02 - .byte VOL , 25*se_w025b_mvl/mxv - .byte BEND , c_v-64 - .byte W24 - .byte FINE - -@********************** Track 2 **********************@ - -se_w025b_2: - .byte KEYSH , se_w025b_key+0 - .byte VOICE , 5 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 110*se_w025b_mvl/mxv - .byte PAN , c_v+9 - .byte N03 , Gs2 , v092 - .byte W06 - .byte PAN , c_v-7 - .byte N03 , Gs2 , v052 - .byte W03 - .byte N03 - .byte W05 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte N13 - .byte W04 - .byte VOL , 101*se_w025b_mvl/mxv - .byte W02 - .byte 83*se_w025b_mvl/mxv - .byte W02 - .byte 58*se_w025b_mvl/mxv - .byte W02 - .byte W01 - .byte 25*se_w025b_mvl/mxv - .byte W23 - .byte FINE - -@******************************************************@ - .align 2 - -se_w025b: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w025b_pri @ Priority - .byte se_w025b_rev @ Reverb. - - .word se_w025b_grp - - .word se_w025b_1 - .word se_w025b_2 - - .end |