diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 14:40:41 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 14:40:41 -0400 |
| commit | 33872e8899962c1ed81dcff64328795ace0014a2 (patch) | |
| tree | 6583b78a6bd2f6bf27e77a773a9c80304ca6f4aa | |
| parent | ecf9d206e2738dd2cb4c530263b3367a75f007f3 (diff) | |
Match se_bowa2.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_bowa2.mid | bin | 0 -> 181 bytes | |||
| -rw-r--r-- | sound/songs/se_bowa2.s | 83 |
4 files changed, 4 insertions, 84 deletions
diff --git a/ld_script.txt b/ld_script.txt index f1aa96fc2..8fd9ff839 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -579,7 +579,7 @@ SECTIONS { sound/songs/se_kouka_l.o(.rodata); sound/songs/se_kouka_m.o(.rodata); sound/songs/se_kouka_h.o(.rodata); - sound/songs/se_bowa2.o(.rodata); + sound/songs/midi/se_bowa2.o(.rodata); sound/songs/se_poke_dead.o(.rodata); sound/songs/se_nigeru.o(.rodata); sound/songs/se_jido_doa.o(.rodata); @@ -804,5 +804,8 @@ $(MID_SUBDIR)/se_boo.s: %.s: %.mid $(MID_SUBDIR)/se_bowa.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V070 -P4 +$(MID_SUBDIR)/se_bowa2.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_bowa2.mid b/sound/songs/midi/se_bowa2.mid Binary files differnew file mode 100644 index 000000000..669bed700 --- /dev/null +++ b/sound/songs/midi/se_bowa2.mid diff --git a/sound/songs/se_bowa2.s b/sound/songs/se_bowa2.s deleted file mode 100644 index 571c45291..000000000 --- a/sound/songs/se_bowa2.s +++ /dev/null @@ -1,83 +0,0 @@ - .include "MPlayDef.s" - - .equ se_bowa2_grp, voicegroup127 - .equ se_bowa2_pri, 5 - .equ se_bowa2_rev, reverb_set+50 - .equ se_bowa2_mvl, 127 - .equ se_bowa2_key, 0 - .equ se_bowa2_tbs, 1 - .equ se_bowa2_exg, 0 - .equ se_bowa2_cmp, 1 - - .section .rodata - .global se_bowa2 - .align 2 - -@********************** Track 1 **********************@ - -se_bowa2_1: - .byte KEYSH , se_bowa2_key+0 - .byte TEMPO , 90*se_bowa2_tbs/2 - .byte VOICE , 86 - .byte VOL , 100*se_bowa2_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Gn1 , v100 - .byte W03 - .byte N05 , Fn2 - .byte W03 - .byte W03 - .byte N06 , Fn2 , v052 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_bowa2_2: - .byte KEYSH , se_bowa2_key+0 - .byte VOICE , 0 - .byte VOL , 100*se_bowa2_mvl/mxv - .byte BENDR , 12 - .byte BEND , c_v+0 - .byte N03 , Gn3 , v052 - .byte W03 - .byte Cn2 , v112 - .byte W03 - .byte W03 - .byte Cn1 , v092 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 3 **********************@ - -se_bowa2_3: - .byte KEYSH , se_bowa2_key+0 - .byte VOICE , 124 - .byte VOL , 100*se_bowa2_mvl/mxv - .byte N03 , Gn3 , v052 - .byte W03 - .byte N06 , Gs4 - .byte W03 - .byte W03 - .byte Gs4 , v020 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_bowa2: - .byte 3 @ NumTrks - .byte 0 @ NumBlks - .byte se_bowa2_pri @ Priority - .byte se_bowa2_rev @ Reverb. - - .word se_bowa2_grp - - .word se_bowa2_1 - .word se_bowa2_2 - .word se_bowa2_3 - - .end |