diff options
author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 14:38:28 -0400 |
---|---|---|
committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 14:38:28 -0400 |
commit | ecf9d206e2738dd2cb4c530263b3367a75f007f3 (patch) | |
tree | e4030c4aadc6be2b87a8331dbf2d449bf1f3345e | |
parent | 50393acc65306d86d907787fa1ad11f69e2d288c (diff) |
Match se_bowa.mid
-rw-r--r-- | ld_script.txt | 2 | ||||
-rw-r--r-- | songs.mk | 3 | ||||
-rw-r--r-- | sound/songs/midi/se_bowa.mid | bin | 0 -> 86 bytes | |||
-rw-r--r-- | sound/songs/se_bowa.s | 45 |
4 files changed, 4 insertions, 46 deletions
diff --git a/ld_script.txt b/ld_script.txt index fb33456bd..f1aa96fc2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -587,7 +587,7 @@ SECTIONS { sound/songs/midi/se_ban.o(.rodata); sound/songs/se_pin.o(.rodata); sound/songs/midi/se_boo.o(.rodata); - sound/songs/se_bowa.o(.rodata); + sound/songs/midi/se_bowa.o(.rodata); sound/songs/se_jyuni.o(.rodata); sound/songs/midi/se_a.o(.rodata); sound/songs/se_i.o(.rodata); @@ -801,5 +801,8 @@ $(MID_SUBDIR)/se_bidoro.s: %.s: %.mid $(MID_SUBDIR)/se_boo.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 +$(MID_SUBDIR)/se_bowa.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V070 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_bowa.mid b/sound/songs/midi/se_bowa.mid Binary files differnew file mode 100644 index 000000000..684ea618c --- /dev/null +++ b/sound/songs/midi/se_bowa.mid diff --git a/sound/songs/se_bowa.s b/sound/songs/se_bowa.s deleted file mode 100644 index 93b84265b..000000000 --- a/sound/songs/se_bowa.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_bowa_grp, voicegroup127 - .equ se_bowa_pri, 4 - .equ se_bowa_rev, reverb_set+50 - .equ se_bowa_mvl, 127 - .equ se_bowa_key, 0 - .equ se_bowa_tbs, 1 - .equ se_bowa_exg, 0 - .equ se_bowa_cmp, 1 - - .section .rodata - .global se_bowa - .align 2 - -@********************** Track 1 **********************@ - -se_bowa_1: - .byte KEYSH , se_bowa_key+0 - .byte TEMPO , 128*se_bowa_tbs/2 - .byte VOICE , 7 - .byte BENDR , 12 - .byte VOL , 70*se_bowa_mvl/mxv - .byte BEND , c_v+2 - .byte N04 , Fn2 , v127 - .byte W04 - .byte N01 , Dn3 - .byte W02 - .byte VOICE , 8 - .byte FINE - -@******************************************************@ - .align 2 - -se_bowa: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_bowa_pri @ Priority - .byte se_bowa_rev @ Reverb. - - .word se_bowa_grp - - .word se_bowa_1 - - .end |