diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-03 17:26:34 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-03 17:26:34 -0400 |
| commit | a94c66139e9dbd89718482ff946819c29f5ab937 (patch) | |
| tree | 934702db3f0f7590da1358b084e45fe6248dc944 | |
| parent | dbe15410ded137271c8fd5710cc4d9dce2d85b2d (diff) | |
Match ph_cloth_solo.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/ph_cloth_solo.mid | bin | 0 -> 68 bytes | |||
| -rw-r--r-- | sound/songs/ph_cloth_solo.s | 40 |
4 files changed, 4 insertions, 41 deletions
diff --git a/ld_script.txt b/ld_script.txt index 5e69c604a..644867947 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1049,8 +1049,8 @@ SECTIONS { sound/songs/ph_face_held.o(.rodata); sound/songs/ph_face_solo.o(.rodata); sound/songs/midi/ph_cloth_blend.o(.rodata); - sound/songs/ph_cloth_solo.o(.rodata); sound/songs/midi/ph_cloth_held.o(.rodata); + sound/songs/midi/ph_cloth_solo.o(.rodata); sound/songs/ph_dress_blend.o(.rodata); sound/songs/ph_dress_held.o(.rodata); sound/songs/ph_dress_solo.o(.rodata); @@ -648,5 +648,8 @@ $(MID_SUBDIR)/ph_cloth_blend.s: %.s: %.mid $(MID_SUBDIR)/ph_cloth_held.s: %.s: %.mid $(MID) $< $@ -E -G130 -P4 +$(MID_SUBDIR)/ph_cloth_solo.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_solo.mid b/sound/songs/midi/ph_cloth_solo.mid Binary files differnew file mode 100644 index 000000000..84755426a --- /dev/null +++ b/sound/songs/midi/ph_cloth_solo.mid diff --git a/sound/songs/ph_cloth_solo.s b/sound/songs/ph_cloth_solo.s deleted file mode 100644 index 6dc5b50f9..000000000 --- a/sound/songs/ph_cloth_solo.s +++ /dev/null @@ -1,40 +0,0 @@ - .include "MPlayDef.s" - - .equ ph_cloth_solo_grp, voicegroup130 - .equ ph_cloth_solo_pri, 4 - .equ ph_cloth_solo_rev, 0 - .equ ph_cloth_solo_mvl, 127 - .equ ph_cloth_solo_key, 0 - .equ ph_cloth_solo_tbs, 1 - .equ ph_cloth_solo_exg, 0 - .equ ph_cloth_solo_cmp, 1 - - .section .rodata - .global ph_cloth_solo - .align 2 - -@********************** Track 1 **********************@ - -ph_cloth_solo_1: - .byte KEYSH , ph_cloth_solo_key+0 - .byte TEMPO , 120*ph_cloth_solo_tbs/2 - .byte VOICE , 8 - .byte VOL , 127*ph_cloth_solo_mvl/mxv - .byte N54 , Cn3 , v127 - .byte W54 - .byte FINE - -@******************************************************@ - .align 2 - -ph_cloth_solo: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte ph_cloth_solo_pri @ Priority - .byte ph_cloth_solo_rev @ Reverb. - - .word ph_cloth_solo_grp - - .word ph_cloth_solo_1 - - .end |