diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/ph_choice_solo.mid | bin | 0 -> 68 bytes | |||
| -rw-r--r-- | sound/songs/ph_choice_solo.s | 40 |
4 files changed, 4 insertions, 41 deletions
diff --git a/ld_script.txt b/ld_script.txt index 06518e6a8..0c7cd6660 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1074,7 +1074,7 @@ SECTIONS { sound/songs/ph_thought_solo.o(.rodata); sound/songs/midi/ph_choice_blend.o(.rodata); sound/songs/midi/ph_choice_held.o(.rodata); - sound/songs/ph_choice_solo.o(.rodata); + sound/songs/midi/ph_choice_solo.o(.rodata); sound/songs/ph_mouth_blend.o(.rodata); sound/songs/ph_mouth_held.o(.rodata); sound/songs/ph_mouth_solo.o(.rodata); @@ -639,5 +639,8 @@ $(MID_SUBDIR)/ph_choice_blend.s: %.s: %.mid $(MID_SUBDIR)/ph_choice_held.s: %.s: %.mid $(MID) $< $@ -E -G130 -P4 +$(MID_SUBDIR)/ph_choice_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_choice_solo.mid b/sound/songs/midi/ph_choice_solo.mid Binary files differnew file mode 100644 index 000000000..e72f7d22e --- /dev/null +++ b/sound/songs/midi/ph_choice_solo.mid diff --git a/sound/songs/ph_choice_solo.s b/sound/songs/ph_choice_solo.s deleted file mode 100644 index 0f2b997a1..000000000 --- a/sound/songs/ph_choice_solo.s +++ /dev/null @@ -1,40 +0,0 @@ - .include "MPlayDef.s" - - .equ ph_choice_solo_grp, voicegroup130 - .equ ph_choice_solo_pri, 4 - .equ ph_choice_solo_rev, 0 - .equ ph_choice_solo_mvl, 127 - .equ ph_choice_solo_key, 0 - .equ ph_choice_solo_tbs, 1 - .equ ph_choice_solo_exg, 0 - .equ ph_choice_solo_cmp, 1 - - .section .rodata - .global ph_choice_solo - .align 2 - -@********************** Track 1 **********************@ - -ph_choice_solo_1: - .byte KEYSH , ph_choice_solo_key+0 - .byte TEMPO , 120*ph_choice_solo_tbs/2 - .byte VOICE , 32 - .byte VOL , 127*ph_choice_solo_mvl/mxv - .byte N54 , Cn3 , v127 - .byte W54 - .byte FINE - -@******************************************************@ - .align 2 - -ph_choice_solo: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte ph_choice_solo_pri @ Priority - .byte ph_choice_solo_rev @ Reverb. - - .word ph_choice_solo_grp - - .word ph_choice_solo_1 - - .end |