diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 15:21:53 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 15:21:53 -0400 |
| commit | b985d45ddbcbeb92b1a3f660bf1a0f6ba4b82291 (patch) | |
| tree | bd7eeb55e79cdce31c707e3b7d75b9e06ca79492 | |
| parent | 3b929049daf1ab24be43d45b62764115087fddae (diff) | |
Match se_dendou.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_dendou.mid | bin | 0 -> 703 bytes | |||
| -rw-r--r-- | sound/songs/se_dendou.s | 197 |
4 files changed, 4 insertions, 198 deletions
diff --git a/ld_script.txt b/ld_script.txt index ec3dd2f72..a4aff88c7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -669,7 +669,7 @@ SECTIONS { sound/songs/se_reapoke.o(.rodata); sound/songs/se_op_basyu.o(.rodata); sound/songs/midi/se_bt_start.o(.rodata); - sound/songs/se_dendou.o(.rodata); + sound/songs/midi/se_dendou.o(.rodata); sound/songs/se_jihanki.o(.rodata); sound/songs/se_tama.o(.rodata); sound/songs/se_z_scroll.o(.rodata); @@ -843,5 +843,8 @@ $(MID_SUBDIR)/se_dansa.s: %.s: %.mid $(MID_SUBDIR)/se_daugi.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 +$(MID_SUBDIR)/se_dendou.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_dendou.mid b/sound/songs/midi/se_dendou.mid Binary files differnew file mode 100644 index 000000000..4ab2a2212 --- /dev/null +++ b/sound/songs/midi/se_dendou.mid diff --git a/sound/songs/se_dendou.s b/sound/songs/se_dendou.s deleted file mode 100644 index 4fda6d338..000000000 --- a/sound/songs/se_dendou.s +++ /dev/null @@ -1,197 +0,0 @@ - .include "MPlayDef.s" - - .equ se_dendou_grp, voicegroup128 - .equ se_dendou_pri, 5 - .equ se_dendou_rev, reverb_set+50 - .equ se_dendou_mvl, 127 - .equ se_dendou_key, 0 - .equ se_dendou_tbs, 1 - .equ se_dendou_exg, 0 - .equ se_dendou_cmp, 1 - - .section .rodata - .global se_dendou - .align 2 - -@********************** Track 1 **********************@ - -se_dendou_1: - .byte KEYSH , se_dendou_key+0 - .byte TEMPO , 150*se_dendou_tbs/2 - .byte VOICE , 60 - .byte BENDR , 12 - .byte VOL , 25*se_dendou_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte TIE , Bn2 , v127 - .byte W01 - .byte PAN , c_v+2 - .byte W01 - .byte c_v+5 - .byte W01 - .byte VOL , 34*se_dendou_mvl/mxv - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 46*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 56*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W01 - .byte VOL , 70*se_dendou_mvl/mxv - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 80*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 88*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte VOL , 96*se_dendou_mvl/mxv - .byte PAN , c_v+5 - .byte W02 - .byte c_v+2 - .byte W02 - .byte VOL , 100*se_dendou_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte c_v-2 - .byte W02 -se_dendou_1_000: - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W02 - .byte c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte c_v-2 - .byte W02 - .byte PEND - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte VOL , 96*se_dendou_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W01 - .byte VOL , 92*se_dendou_mvl/mxv - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 84*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 72*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte VOL , 63*se_dendou_mvl/mxv - .byte PAN , c_v+5 - .byte W02 - .byte VOL , 52*se_dendou_mvl/mxv - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 37*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W01 - .byte VOL , 22*se_dendou_mvl/mxv - .byte W01 - .byte 12*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte EOT , Bn2 - .byte FINE - -@******************************************************@ - .align 2 - -se_dendou: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_dendou_pri @ Priority - .byte se_dendou_rev @ Reverb. - - .word se_dendou_grp - - .word se_dendou_1 - - .end |