diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 16:38:26 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | 3f997ef4c26bb5459c7a41da2901e5500fa5ab73 (patch) | |
| tree | 81ca0e4e50a44bbfc3fbd3ffbb7363c589ed219d | |
| parent | b532e51659828c8be3a6eb9cf40f157e99c90606 (diff) | |
Match se_ussoki.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_ussoki.mid | bin | 0 -> 127 bytes | |||
| -rw-r--r-- | sound/songs/se_ussoki.s | 55 |
4 files changed, 4 insertions, 56 deletions
diff --git a/ld_script.txt b/ld_script.txt index 6be682f6e..10369c86c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -903,7 +903,7 @@ SECTIONS { sound/songs/midi/se_hantei2.o(.rodata); sound/songs/midi/se_curtain.o(.rodata); sound/songs/midi/se_curtain1.o(.rodata); - sound/songs/se_ussoki.o(.rodata); + sound/songs/midi/se_ussoki.o(.rodata); sound/songs/midi/mus_tetsuji.o(.rodata); sound/songs/midi/mus_field13.o(.rodata); sound/songs/midi/mus_kachi22.o(.rodata); @@ -1185,5 +1185,8 @@ $(MID_SUBDIR)/se_tu_saa.s: %.s: %.mid $(MID_SUBDIR)/se_u.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 +$(MID_SUBDIR)/se_ussoki.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V077 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_ussoki.mid b/sound/songs/midi/se_ussoki.mid Binary files differnew file mode 100644 index 000000000..c5be0de8d --- /dev/null +++ b/sound/songs/midi/se_ussoki.mid diff --git a/sound/songs/se_ussoki.s b/sound/songs/se_ussoki.s deleted file mode 100644 index b04f6708f..000000000 --- a/sound/songs/se_ussoki.s +++ /dev/null @@ -1,55 +0,0 @@ - .include "MPlayDef.s" - - .equ se_ussoki_grp, voicegroup129 - .equ se_ussoki_pri, 5 - .equ se_ussoki_rev, reverb_set+50 - .equ se_ussoki_mvl, 127 - .equ se_ussoki_key, 0 - .equ se_ussoki_tbs, 1 - .equ se_ussoki_exg, 0 - .equ se_ussoki_cmp, 1 - - .section .rodata - .global se_ussoki - .align 2 - -@********************** Track 1 **********************@ - -se_ussoki_1: - .byte KEYSH , se_ussoki_key+0 - .byte TEMPO , 100*se_ussoki_tbs/2 - .byte VOICE , 127 - .byte PAN , c_v+0 - .byte VOL , 77*se_ussoki_mvl/mxv - .byte N03 , Cn5 , v096 - .byte W06 - .byte N01 , Gn5 , v064 - .byte W06 - .byte N03 , Cn5 , v100 - .byte W06 - .byte N01 , Gn5 , v064 - .byte W06 -se_ussoki_1_000: - .byte N03 , Cn5 , v096 - .byte W06 - .byte N01 , Gn5 , v064 - .byte W06 - .byte PEND - .byte PATT - .word se_ussoki_1_000 - .byte FINE - -@******************************************************@ - .align 2 - -se_ussoki: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_ussoki_pri @ Priority - .byte se_ussoki_rev @ Reverb. - - .word se_ussoki_grp - - .word se_ussoki_1 - - .end |