diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-03 17:21:42 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-03 17:21:42 -0400 |
| commit | 86f80debe2e1fe41810b02d106e25eac1a1386b5 (patch) | |
| tree | c85d1a57826a5e84a00197803a04c63586a1acf9 | |
| parent | b32e85ac9092e811a9ec96e6681723dc11c392e3 (diff) | |
Match ph_choice_held.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/ph_choice_held.mid | bin | 0 -> 79 bytes | |||
| -rw-r--r-- | sound/songs/ph_choice_held.s | 46 |
4 files changed, 4 insertions, 47 deletions
diff --git a/ld_script.txt b/ld_script.txt index c083a186c..06518e6a8 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); @@ -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 Binary files differnew file mode 100644 index 000000000..658d7cc43 --- /dev/null +++ b/sound/songs/midi/ph_choice_held.mid diff --git a/sound/songs/ph_choice_held.s b/sound/songs/ph_choice_held.s deleted file mode 100644 index c44bda579..000000000 --- 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 |