diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:52:47 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:52:47 -0500 |
| commit | 88167d3183c82c9f4eda27940a2a176a3bfbf375 (patch) | |
| tree | 0d5a556d0b5fa14f0d16e1fce7c2c21f0a3feb15 | |
| parent | 5e423fb5ea5d8c7416dc705ebe17304bfda89619 (diff) | |
Match se_select.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_select.mid | bin | 0 -> 107 bytes | |||
| -rw-r--r-- | sound/songs/se_select.s | 50 |
4 files changed, 4 insertions, 51 deletions
diff --git a/ld_script.txt b/ld_script.txt index 295ec335e..401c9c784 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -620,7 +620,7 @@ SECTIONS { sound/songs/midi/se_pc_login.o(.rodata); sound/songs/midi/se_pc_off.o(.rodata); sound/songs/midi/se_pc_on.o(.rodata); - sound/songs/se_select.o(.rodata); + sound/songs/midi/se_select.o(.rodata); sound/songs/se_win_open.o(.rodata); sound/songs/se_wall_hit.o(.rodata); sound/songs/midi/se_door.o(.rodata); @@ -1071,5 +1071,8 @@ $(MID_SUBDIR)/se_save.s: %.s: %.mid $(MID_SUBDIR)/se_seikai.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P4 +$(MID_SUBDIR)/se_select.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_select.mid b/sound/songs/midi/se_select.mid Binary files differnew file mode 100644 index 000000000..5f38c82d7 --- /dev/null +++ b/sound/songs/midi/se_select.mid diff --git a/sound/songs/se_select.s b/sound/songs/se_select.s deleted file mode 100644 index a20e08956..000000000 --- a/sound/songs/se_select.s +++ /dev/null @@ -1,50 +0,0 @@ - .include "MPlayDef.s" - - .equ se_select_grp, voicegroup127 - .equ se_select_pri, 5 - .equ se_select_rev, reverb_set+50 - .equ se_select_mvl, 127 - .equ se_select_key, 0 - .equ se_select_tbs, 1 - .equ se_select_exg, 0 - .equ se_select_cmp, 1 - - .section .rodata - .global se_select - .align 2 - -@********************** Track 1 **********************@ - -se_select_1: - .byte KEYSH , se_select_key+0 - .byte TEMPO , 300*se_select_tbs/2 - .byte VOICE , 87 - .byte VOL , 80*se_select_mvl/mxv - .byte BEND , c_v+13 - .byte N03 , As5 , v068 - .byte W03 - .byte Gn6 , v127 - .byte W03 - .byte Gn6 , v068 - .byte W03 - .byte Gn6 , v127 - .byte W03 - .byte VOICE , 88 - .byte N06 , Gn6 , v068 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_select: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_select_pri @ Priority - .byte se_select_rev @ Reverb. - - .word se_select_grp - - .word se_select_1 - - .end |