diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 16:51:23 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 16:51:23 -0500 |
| commit | 2a76f30d2181cecb37f840aff61d1c197cbb9ef8 (patch) | |
| tree | 606292100639b9bea9b8435b011a15d13e8ea53c | |
| parent | 64ae0f244d57b04b1db8cd69f9d46066905cfe79 (diff) | |
Match se_pn_on.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_pn_on.mid | bin | 0 -> 227 bytes | |||
| -rw-r--r-- | sound/songs/se_pn_on.s | 86 |
4 files changed, 4 insertions, 87 deletions
diff --git a/ld_script.txt b/ld_script.txt index e315957a3..b3c9b6f46 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -725,7 +725,7 @@ SECTIONS { sound/songs/se_tama.o(.rodata); sound/songs/se_z_scroll.o(.rodata); sound/songs/se_z_page.o(.rodata); - sound/songs/se_pn_on.o(.rodata); + sound/songs/midi/se_pn_on.o(.rodata); sound/songs/midi/se_pn_off.o(.rodata); sound/songs/midi/se_z_search.o(.rodata); sound/songs/se_tamago.o(.rodata); @@ -996,5 +996,8 @@ $(MID_SUBDIR)/se_pinpon.s: %.s: %.mid $(MID_SUBDIR)/se_pn_off.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 +$(MID_SUBDIR)/se_pn_on.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_on.mid b/sound/songs/midi/se_pn_on.mid Binary files differnew file mode 100644 index 000000000..dfe850794 --- /dev/null +++ b/sound/songs/midi/se_pn_on.mid diff --git a/sound/songs/se_pn_on.s b/sound/songs/se_pn_on.s deleted file mode 100644 index 9c6186399..000000000 --- a/sound/songs/se_pn_on.s +++ /dev/null @@ -1,86 +0,0 @@ - .include "MPlayDef.s" - - .equ se_pn_on_grp, voicegroup127 - .equ se_pn_on_pri, 5 - .equ se_pn_on_rev, reverb_set+50 - .equ se_pn_on_mvl, 127 - .equ se_pn_on_key, 0 - .equ se_pn_on_tbs, 1 - .equ se_pn_on_exg, 0 - .equ se_pn_on_cmp, 1 - - .section .rodata - .global se_pn_on - .align 2 - -@********************** Track 1 **********************@ - -se_pn_on_1: - .byte KEYSH , se_pn_on_key+0 - .byte TEMPO , 144*se_pn_on_tbs/2 - .byte VOICE , 4 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 100*se_pn_on_mvl/mxv - .byte BEND , c_v-6 - .byte N02 , Cn4 , v060 - .byte W02 - .byte N01 , Cn4 , v032 - .byte W01 - .byte N02 , Gn4 , v060 - .byte W03 - .byte N01 , Gn4 , v032 - .byte W01 - .byte N02 , Cn4 , v060 - .byte W02 - .byte Cn4 , v032 - .byte W03 - .byte Cn5 , v060 - .byte W02 - .byte Cn5 , v032 - .byte W04 - .byte FINE - -@********************** Track 2 **********************@ - -se_pn_on_2: - .byte KEYSH , se_pn_on_key+0 - .byte VOICE , 14 - .byte VOL , 50*se_pn_on_mvl/mxv - .byte BEND , c_v-2 - .byte W01 - .byte N02 , Cn4 , v060 - .byte W02 - .byte N01 , Cn4 , v032 - .byte W01 - .byte N02 , Gn4 , v060 - .byte W02 - .byte W01 - .byte N01 , Gn4 , v032 - .byte W01 - .byte N02 , Cn4 , v060 - .byte W02 - .byte Cn4 , v032 - .byte W02 - .byte W01 - .byte Cn5 , v060 - .byte W02 - .byte Cn5 , v032 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_pn_on: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_pn_on_pri @ Priority - .byte se_pn_on_rev @ Reverb. - - .word se_pn_on_grp - - .word se_pn_on_1 - .word se_pn_on_2 - - .end |