diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 17:01:50 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | 3e53b505eec8653df6aa000110b0bda1d469e05a (patch) | |
| tree | b2a6ee5542eff1443297cace8e35b50e2d181e04 | |
| parent | 0a581cf1c6775ba53e642023f2c2cd80df23a9a9 (diff) | |
Match se_w017.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_w017.mid | bin | 0 -> 284 bytes | |||
| -rw-r--r-- | sound/songs/se_w017.s | 125 |
4 files changed, 4 insertions, 126 deletions
diff --git a/ld_script.txt b/ld_script.txt index 15781cc2a..40181b100 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -791,7 +791,7 @@ SECTIONS { sound/songs/se_w059b.o(.rodata); sound/songs/midi/se_w010.o(.rodata); sound/songs/midi/se_w011.o(.rodata); - sound/songs/se_w017.o(.rodata); + sound/songs/midi/se_w017.o(.rodata); sound/songs/se_w019.o(.rodata); sound/songs/se_w028.o(.rodata); sound/songs/midi/se_w013b.o(.rodata); @@ -1224,5 +1224,8 @@ $(MID_SUBDIR)/se_w016.s: %.s: %.mid $(MID_SUBDIR)/se_w016b.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_w017.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_w017.mid b/sound/songs/midi/se_w017.mid Binary files differnew file mode 100644 index 000000000..459e72406 --- /dev/null +++ b/sound/songs/midi/se_w017.mid diff --git a/sound/songs/se_w017.s b/sound/songs/se_w017.s deleted file mode 100644 index ad992a1c0..000000000 --- a/sound/songs/se_w017.s +++ /dev/null @@ -1,125 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w017_grp, voicegroup128 - .equ se_w017_pri, 4 - .equ se_w017_rev, reverb_set+50 - .equ se_w017_mvl, 127 - .equ se_w017_key, 0 - .equ se_w017_tbs, 1 - .equ se_w017_exg, 0 - .equ se_w017_cmp, 1 - - .section .rodata - .global se_w017 - .align 2 - -@********************** Track 1 **********************@ - -se_w017_1: - .byte KEYSH , se_w017_key+0 - .byte TEMPO , 220*se_w017_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 40*se_w017_mvl/mxv - .byte BEND , c_v-32 - .byte N10 , An1 , v127 - .byte W01 - .byte VOL , 52*se_w017_mvl/mxv - .byte PAN , c_v+10 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 68*se_w017_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 82*se_w017_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 105*se_w017_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+19 - .byte W02 - .byte PAN , c_v+10 - .byte BEND , c_v+28 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+38 - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v+49 - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte W05 - .byte VOL , 40*se_w017_mvl/mxv - .byte BEND , c_v+1 - .byte N06 - .byte W01 - .byte VOL , 52*se_w017_mvl/mxv - .byte PAN , c_v+10 - .byte BEND , c_v+38 - .byte W01 - .byte VOL , 79*se_w017_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+48 - .byte W02 - .byte VOL , 105*se_w017_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+63 - .byte W01 - .byte PAN , c_v+0 - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_w017_2: - .byte KEYSH , se_w017_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 52*se_w017_mvl/mxv - .byte N10 , Gn2 , v040 - .byte W01 - .byte VOL , 69*se_w017_mvl/mxv - .byte W01 - .byte 83*se_w017_mvl/mxv - .byte W01 - .byte 105*se_w017_mvl/mxv - .byte W01 - .byte 85*se_w017_mvl/mxv - .byte W02 - .byte 52*se_w017_mvl/mxv - .byte W01 - .byte 29*se_w017_mvl/mxv - .byte W01 - .byte 12*se_w017_mvl/mxv - .byte W06 - .byte VOICE , 25 - .byte VOL , 52*se_w017_mvl/mxv - .byte N06 , Gs4 - .byte W01 - .byte VOL , 81*se_w017_mvl/mxv - .byte W01 - .byte 105*se_w017_mvl/mxv - .byte W03 - .byte 52*se_w017_mvl/mxv - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_w017: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w017_pri @ Priority - .byte se_w017_rev @ Reverb. - - .word se_w017_grp - - .word se_w017_1 - .word se_w017_2 - - .end |