diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 17:12:04 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | 08a565dadd67db5c7b4d185aa316d9ac18e586b7 (patch) | |
| tree | 04cee7ed109bb52544228af7845a57d46c1cc23d | |
| parent | 4f1ba2c1adb3c5f98ecf0cf669d8c277cbf00f9d (diff) | |
Match se_w026.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w026.mid | bin | 0 -> 141 bytes | |||
| -rw-r--r-- | sound/songs/se_w026.s | 71 |
4 files changed, 4 insertions, 72 deletions
diff --git a/ld_script.txt b/ld_script.txt index 5613d49f7..e18106f6d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -777,7 +777,7 @@ SECTIONS { sound/songs/midi/se_w025.o(.rodata); sound/songs/midi/se_w025b.o(.rodata); sound/songs/se_w152.o(.rodata); - sound/songs/se_w026.o(.rodata); + sound/songs/midi/se_w026.o(.rodata); sound/songs/se_w172.o(.rodata); sound/songs/se_w172b.o(.rodata); sound/songs/se_w053.o(.rodata); @@ -1239,5 +1239,8 @@ $(MID_SUBDIR)/se_w025.s: %.s: %.mid $(MID_SUBDIR)/se_w025b.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_w026.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_w026.mid b/sound/songs/midi/se_w026.mid Binary files differnew file mode 100644 index 000000000..d43366801 --- /dev/null +++ b/sound/songs/midi/se_w026.mid diff --git a/sound/songs/se_w026.s b/sound/songs/se_w026.s deleted file mode 100644 index d7e9f8425..000000000 --- a/sound/songs/se_w026.s +++ /dev/null @@ -1,71 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w026_grp, voicegroup128 - .equ se_w026_pri, 4 - .equ se_w026_rev, reverb_set+50 - .equ se_w026_mvl, 127 - .equ se_w026_key, 0 - .equ se_w026_tbs, 1 - .equ se_w026_exg, 0 - .equ se_w026_cmp, 1 - - .section .rodata - .global se_w026 - .align 2 - -@********************** Track 1 **********************@ - -se_w026_1: - .byte KEYSH , se_w026_key+0 - .byte TEMPO , 180*se_w026_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w026_mvl/mxv - .byte BEND , c_v-12 - .byte N19 , Gn3 , v108 - .byte W02 - .byte BEND , c_v-5 - .byte W01 - .byte VOL , 101*se_w026_mvl/mxv - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v+8 - .byte W02 - .byte VOL , 84*se_w026_mvl/mxv - .byte BEND , c_v+4 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 64*se_w026_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v+8 - .byte W02 - .byte VOL , 45*se_w026_mvl/mxv - .byte BEND , c_v-31 - .byte W02 - .byte VOL , 32*se_w026_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOICE , 2 - .byte W01 - .byte VOL , 13*se_w026_mvl/mxv - .byte BEND , c_v-52 - .byte W08 - .byte FINE - -@******************************************************@ - .align 2 - -se_w026: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w026_pri @ Priority - .byte se_w026_rev @ Reverb. - - .word se_w026_grp - - .word se_w026_1 - - .end |