diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 16:43:21 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 16:43:21 -0500 |
| commit | e5d535cdf42970368caff185d406e4dcf8d43c51 (patch) | |
| tree | 6a8adb70b7177562a6471a2a372accdb351ac54f | |
| parent | 34a8cc8acd3178dec1546068e8812f654205a130 (diff) | |
Match se_pin.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_pin.mid | bin | 0 -> 107 bytes | |||
| -rw-r--r-- | sound/songs/se_pin.s | 50 |
4 files changed, 4 insertions, 51 deletions
diff --git a/ld_script.txt b/ld_script.txt index b688c2c72..08583e6fe 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -636,7 +636,7 @@ SECTIONS { sound/songs/midi/se_jido_doa.o(.rodata); sound/songs/midi/se_naminori.o(.rodata); sound/songs/midi/se_ban.o(.rodata); - sound/songs/se_pin.o(.rodata); + sound/songs/midi/se_pin.o(.rodata); sound/songs/midi/se_boo.o(.rodata); sound/songs/midi/se_bowa.o(.rodata); sound/songs/midi/se_jyuni.o(.rodata); @@ -987,5 +987,8 @@ $(MID_SUBDIR)/se_pc_off.s: %.s: %.mid $(MID_SUBDIR)/se_pc_on.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 +$(MID_SUBDIR)/se_pin.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V060 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_pin.mid b/sound/songs/midi/se_pin.mid Binary files differnew file mode 100644 index 000000000..fe59c2f97 --- /dev/null +++ b/sound/songs/midi/se_pin.mid diff --git a/sound/songs/se_pin.s b/sound/songs/se_pin.s deleted file mode 100644 index 29d87b749..000000000 --- a/sound/songs/se_pin.s +++ /dev/null @@ -1,50 +0,0 @@ - .include "MPlayDef.s" - - .equ se_pin_grp, voicegroup127 - .equ se_pin_pri, 4 - .equ se_pin_rev, reverb_set+50 - .equ se_pin_mvl, 127 - .equ se_pin_key, 0 - .equ se_pin_tbs, 1 - .equ se_pin_exg, 0 - .equ se_pin_cmp, 1 - - .section .rodata - .global se_pin - .align 2 - -@********************** Track 1 **********************@ - -se_pin_1: - .byte KEYSH , se_pin_key+0 - .byte TEMPO , 100*se_pin_tbs/2 - .byte VOICE , 5 - .byte BENDR , 12 - .byte VOL , 60*se_pin_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn5 , v127 - .byte W03 - .byte Gn6 , v112 - .byte W03 - .byte Gn6 , v024 - .byte W03 - .byte Gn6 , v068 - .byte W03 - .byte Gn6 , v024 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_pin: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_pin_pri @ Priority - .byte se_pin_rev @ Reverb. - - .word se_pin_grp - - .word se_pin_1 - - .end |