diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-03 17:24:20 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-03 17:24:20 -0400 |
| commit | 458b25ec09d953aa62ee73daa85b8efe23b40967 (patch) | |
| tree | 82ef748d421fd00f7d6907f3e004c79665316b3a | |
| parent | 6fd2d4ad3b5e7ee1ccb8b6d1f9a15d84a89524e0 (diff) | |
Match ph_cloth_blend.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/ph_cloth_blend.mid | bin | 0 -> 68 bytes | |||
| -rw-r--r-- | sound/songs/ph_cloth_blend.s | 40 |
4 files changed, 4 insertions, 41 deletions
diff --git a/ld_script.txt b/ld_script.txt index 0c7cd6660..2ad45fa3b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1048,7 +1048,7 @@ SECTIONS { sound/songs/ph_face_blend.o(.rodata); sound/songs/ph_face_held.o(.rodata); sound/songs/ph_face_solo.o(.rodata); - sound/songs/ph_cloth_blend.o(.rodata); + sound/songs/midi/ph_cloth_blend.o(.rodata); sound/songs/ph_cloth_held.o(.rodata); sound/songs/ph_cloth_solo.o(.rodata); sound/songs/ph_dress_blend.o(.rodata); @@ -642,5 +642,8 @@ $(MID_SUBDIR)/ph_choice_held.s: %.s: %.mid $(MID_SUBDIR)/ph_choice_solo.s: %.s: %.mid $(MID) $< $@ -E -G130 -P4 +$(MID_SUBDIR)/ph_cloth_blend.s: %.s: %.mid + $(MID) $< $@ -E -G130 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/ph_cloth_blend.mid b/sound/songs/midi/ph_cloth_blend.mid Binary files differnew file mode 100644 index 000000000..b8a4eff1e --- /dev/null +++ b/sound/songs/midi/ph_cloth_blend.mid diff --git a/sound/songs/ph_cloth_blend.s b/sound/songs/ph_cloth_blend.s deleted file mode 100644 index e28917588..000000000 --- a/sound/songs/ph_cloth_blend.s +++ /dev/null @@ -1,40 +0,0 @@ - .include "MPlayDef.s" - - .equ ph_cloth_blend_grp, voicegroup130 - .equ ph_cloth_blend_pri, 4 - .equ ph_cloth_blend_rev, 0 - .equ ph_cloth_blend_mvl, 127 - .equ ph_cloth_blend_key, 0 - .equ ph_cloth_blend_tbs, 1 - .equ ph_cloth_blend_exg, 0 - .equ ph_cloth_blend_cmp, 1 - - .section .rodata - .global ph_cloth_blend - .align 2 - -@********************** Track 1 **********************@ - -ph_cloth_blend_1: - .byte KEYSH , ph_cloth_blend_key+0 - .byte TEMPO , 120*ph_cloth_blend_tbs/2 - .byte VOICE , 6 - .byte VOL , 127*ph_cloth_blend_mvl/mxv - .byte N54 , Cn3 , v127 - .byte W54 - .byte FINE - -@******************************************************@ - .align 2 - -ph_cloth_blend: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte ph_cloth_blend_pri @ Priority - .byte ph_cloth_blend_rev @ Reverb. - - .word ph_cloth_blend_grp - - .word ph_cloth_blend_1 - - .end |