diff --git a/ld_script.txt b/ld_script.txt index c083a186cf..06518e6a80 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1073,7 +1073,7 @@ SECTIONS { sound/songs/ph_thought_held.o(.rodata); sound/songs/ph_thought_solo.o(.rodata); sound/songs/midi/ph_choice_blend.o(.rodata); - sound/songs/ph_choice_held.o(.rodata); + sound/songs/midi/ph_choice_held.o(.rodata); sound/songs/ph_choice_solo.o(.rodata); sound/songs/ph_mouth_blend.o(.rodata); sound/songs/ph_mouth_held.o(.rodata); diff --git a/songs.mk b/songs.mk index 6ad3b7cbbb..3631f7bb45 100644 --- a/songs.mk +++ b/songs.mk @@ -636,5 +636,8 @@ $(MID_SUBDIR)/mus_yama_eye.s: %.s: %.mid $(MID_SUBDIR)/ph_choice_blend.s: %.s: %.mid $(MID) $< $@ -E -G130 -P4 +$(MID_SUBDIR)/ph_choice_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_choice_held.mid b/sound/songs/midi/ph_choice_held.mid new file mode 100644 index 0000000000..658d7cc432 Binary files /dev/null and b/sound/songs/midi/ph_choice_held.mid differ diff --git a/sound/songs/ph_choice_held.s b/sound/songs/ph_choice_held.s deleted file mode 100644 index c44bda5795..0000000000 --- a/sound/songs/ph_choice_held.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ ph_choice_held_grp, voicegroup130 - .equ ph_choice_held_pri, 4 - .equ ph_choice_held_rev, 0 - .equ ph_choice_held_mvl, 127 - .equ ph_choice_held_key, 0 - .equ ph_choice_held_tbs, 1 - .equ ph_choice_held_exg, 0 - .equ ph_choice_held_cmp, 1 - - .section .rodata - .global ph_choice_held - .align 2 - -@********************** Track 1 **********************@ - -ph_choice_held_1: - .byte KEYSH , ph_choice_held_key+0 - .byte TEMPO , 120*ph_choice_held_tbs/2 - .byte VOICE , 31 - .byte VOL , 127*ph_choice_held_mvl/mxv - .byte TIE , Cn3 , v127 - .byte W96 -ph_choice_held_1_B1: - .byte W96 - .byte GOTO - .word ph_choice_held_1_B1 - .byte W48 - .byte EOT , Cn3 - .byte FINE - -@******************************************************@ - .align 2 - -ph_choice_held: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte ph_choice_held_pri @ Priority - .byte ph_choice_held_rev @ Reverb. - - .word ph_choice_held_grp - - .word ph_choice_held_1 - - .end