diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 16:49:48 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 16:49:48 -0500 |
| commit | 64ae0f244d57b04b1db8cd69f9d46066905cfe79 (patch) | |
| tree | 3335458a734463a0271398677a588b7b06cc5228 | |
| parent | 7e1b74e7520ec9c892621136bde402825e8c8747 (diff) | |
Match se_pn_off.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_pn_off.mid | bin | 0 -> 227 bytes | |||
| -rw-r--r-- | sound/songs/se_pn_off.s | 86 |
4 files changed, 4 insertions, 87 deletions
diff --git a/ld_script.txt b/ld_script.txt index 9844b8948..e315957a3 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -726,7 +726,7 @@ SECTIONS { sound/songs/se_z_scroll.o(.rodata); sound/songs/se_z_page.o(.rodata); sound/songs/se_pn_on.o(.rodata); - sound/songs/se_pn_off.o(.rodata); + sound/songs/midi/se_pn_off.o(.rodata); sound/songs/midi/se_z_search.o(.rodata); sound/songs/se_tamago.o(.rodata); sound/songs/se_tb_start.o(.rodata); @@ -993,5 +993,8 @@ $(MID_SUBDIR)/se_pin.s: %.s: %.mid $(MID_SUBDIR)/se_pinpon.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 +$(MID_SUBDIR)/se_pn_off.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_pn_off.mid b/sound/songs/midi/se_pn_off.mid Binary files differnew file mode 100644 index 000000000..2fba0d159 --- /dev/null +++ b/sound/songs/midi/se_pn_off.mid diff --git a/sound/songs/se_pn_off.s b/sound/songs/se_pn_off.s deleted file mode 100644 index b77a55fc7..000000000 --- a/sound/songs/se_pn_off.s +++ /dev/null @@ -1,86 +0,0 @@ - .include "MPlayDef.s" - - .equ se_pn_off_grp, voicegroup127 - .equ se_pn_off_pri, 5 - .equ se_pn_off_rev, reverb_set+50 - .equ se_pn_off_mvl, 127 - .equ se_pn_off_key, 0 - .equ se_pn_off_tbs, 1 - .equ se_pn_off_exg, 0 - .equ se_pn_off_cmp, 1 - - .section .rodata - .global se_pn_off - .align 2 - -@********************** Track 1 **********************@ - -se_pn_off_1: - .byte KEYSH , se_pn_off_key+0 - .byte TEMPO , 144*se_pn_off_tbs/2 - .byte VOICE , 4 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 100*se_pn_off_mvl/mxv - .byte BEND , c_v-6 - .byte N02 , Gn4 , v060 - .byte W02 - .byte N01 , Gn4 , v032 - .byte W01 - .byte N02 , Dn4 , v060 - .byte W03 - .byte N01 , Dn4 , v032 - .byte W01 - .byte N02 , Gn4 , v060 - .byte W02 - .byte Gn4 , v032 - .byte W03 - .byte Gn3 , v060 - .byte W02 - .byte Gn3 , v032 - .byte W04 - .byte FINE - -@********************** Track 2 **********************@ - -se_pn_off_2: - .byte KEYSH , se_pn_off_key+0 - .byte VOICE , 14 - .byte VOL , 50*se_pn_off_mvl/mxv - .byte BEND , c_v-2 - .byte W01 - .byte N02 , Gn4 , v060 - .byte W02 - .byte N01 , Gn4 , v032 - .byte W01 - .byte N02 , Dn4 , v060 - .byte W02 - .byte W01 - .byte N01 , Dn4 , v032 - .byte W01 - .byte N02 , Gn4 , v060 - .byte W02 - .byte Gn4 , v032 - .byte W02 - .byte W01 - .byte Gn3 , v060 - .byte W02 - .byte Gn3 , v032 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_pn_off: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_pn_off_pri @ Priority - .byte se_pn_off_rev @ Reverb. - - .word se_pn_off_grp - - .word se_pn_off_1 - .word se_pn_off_2 - - .end |