diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:49:15 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:49:15 -0500 |
| commit | 53ca39a8ac08ae6d8de82a99d23b4f1b81c31942 (patch) | |
| tree | edaf35d91d5b18d58b2a90065c0e52ab58a94626 | |
| parent | 3941ce5cf2f5ed8aa91349aead46cf511e08b849 (diff) | |
Match se_save.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_save.mid | bin | 0 -> 179 bytes | |||
| -rw-r--r-- | sound/songs/se_save.s | 78 |
4 files changed, 4 insertions, 79 deletions
diff --git a/ld_script.txt b/ld_script.txt index 3ecf55dfa..79cb12e92 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -670,7 +670,7 @@ SECTIONS { sound/songs/se_track_door.o(.rodata); sound/songs/midi/se_moter.o(.rodata); sound/songs/midi/se_card.o(.rodata); - sound/songs/se_save.o(.rodata); + sound/songs/midi/se_save.o(.rodata); sound/songs/midi/se_kon.o(.rodata); sound/songs/midi/se_kon2.o(.rodata); sound/songs/midi/se_kon3.o(.rodata); @@ -1065,5 +1065,8 @@ $(MID_SUBDIR)/se_ru_gasyan.s: %.s: %.mid $(MID_SUBDIR)/se_ru_hyuu.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_save.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_save.mid b/sound/songs/midi/se_save.mid Binary files differnew file mode 100644 index 000000000..5c4b90697 --- /dev/null +++ b/sound/songs/midi/se_save.mid diff --git a/sound/songs/se_save.s b/sound/songs/se_save.s deleted file mode 100644 index eaedd3e7b..000000000 --- a/sound/songs/se_save.s +++ /dev/null @@ -1,78 +0,0 @@ - .include "MPlayDef.s" - - .equ se_save_grp, voicegroup128 - .equ se_save_pri, 5 - .equ se_save_rev, reverb_set+50 - .equ se_save_mvl, 127 - .equ se_save_key, 0 - .equ se_save_tbs, 1 - .equ se_save_exg, 0 - .equ se_save_cmp, 1 - - .section .rodata - .global se_save - .align 2 - -@********************** Track 1 **********************@ - -se_save_1: - .byte KEYSH , se_save_key+0 - .byte TEMPO , 150*se_save_tbs/2 - .byte VOICE , 14 - .byte VOL , 80*se_save_mvl/mxv - .byte BEND , c_v+17 - .byte N03 , En3 , v096 - .byte W03 - .byte Bn2 - .byte W03 - .byte En3 - .byte W03 - .byte Bn3 - .byte W03 - .byte N06 , Cn5 - .byte W06 - .byte N24 , Cn6 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_save_2: - .byte KEYSH , se_save_key+0 - .byte VOICE , 17 - .byte VOL , 80*se_save_mvl/mxv - .byte N03 , En3 , v100 - .byte W03 - .byte Bn2 - .byte W03 - .byte En3 - .byte W03 - .byte Bn3 - .byte W03 - .byte N06 , Cn5 - .byte W06 - .byte N24 , Cn6 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_save: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_save_pri @ Priority - .byte se_save_rev @ Reverb. - - .word se_save_grp - - .word se_save_1 - .word se_save_2 - - .end |