diff --git a/ld_script.txt b/ld_script.txt index 2ad45fa3b..5e69c604a 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_held.o(.rodata); sound/songs/ph_cloth_solo.o(.rodata); + sound/songs/midi/ph_cloth_held.o(.rodata); sound/songs/ph_dress_blend.o(.rodata); sound/songs/ph_dress_held.o(.rodata); sound/songs/ph_dress_solo.o(.rodata); diff --git a/songs.mk b/songs.mk index 00a9c6e26..186b76383 100644 --- a/songs.mk +++ b/songs.mk @@ -645,5 +645,8 @@ $(MID_SUBDIR)/ph_choice_solo.s: %.s: %.mid $(MID_SUBDIR)/ph_cloth_blend.s: %.s: %.mid $(MID) $< $@ -E -G130 -P4 +$(MID_SUBDIR)/ph_cloth_held.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_held.mid b/sound/songs/midi/ph_cloth_held.mid new file mode 100644 index 000000000..3ef677204 Binary files /dev/null and b/sound/songs/midi/ph_cloth_held.mid differ diff --git a/sound/songs/ph_cloth_held.s b/sound/songs/ph_cloth_held.s deleted file mode 100644 index 6a6929921..000000000 --- a/sound/songs/ph_cloth_held.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ ph_cloth_held_grp, voicegroup130 - .equ ph_cloth_held_pri, 4 - .equ ph_cloth_held_rev, 0 - .equ ph_cloth_held_mvl, 127 - .equ ph_cloth_held_key, 0 - .equ ph_cloth_held_tbs, 1 - .equ ph_cloth_held_exg, 0 - .equ ph_cloth_held_cmp, 1 - - .section .rodata - .global ph_cloth_held - .align 2 - -@********************** Track 1 **********************@ - -ph_cloth_held_1: - .byte KEYSH , ph_cloth_held_key+0 - .byte TEMPO , 120*ph_cloth_held_tbs/2 - .byte VOICE , 7 - .byte VOL , 127*ph_cloth_held_mvl/mxv - .byte TIE , Cn3 , v127 - .byte W96 -ph_cloth_held_1_B1: - .byte W96 - .byte GOTO - .word ph_cloth_held_1_B1 - .byte W48 - .byte EOT , Cn3 - .byte FINE - -@******************************************************@ - .align 2 - -ph_cloth_held: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte ph_cloth_held_pri @ Priority - .byte ph_cloth_held_rev @ Reverb. - - .word ph_cloth_held_grp - - .word ph_cloth_held_1 - - .end