diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 16:45:01 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 16:45:01 -0400 |
| commit | 7f2ddee417145d4b89359feae78cbdb2e0074556 (patch) | |
| tree | 4972b49cad324b1af75593ec74847641138153c3 | |
| parent | e92eabe961d498069f75ac1ebbbeb56d49c95286 (diff) | |
Match se_kouka_h.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_kouka_h.mid | bin | 0 -> 271 bytes | |||
| -rw-r--r-- | sound/songs/se_kouka_h.s | 105 |
4 files changed, 4 insertions, 106 deletions
diff --git a/ld_script.txt b/ld_script.txt index f933ee315..a1385aff2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -578,7 +578,7 @@ SECTIONS { sound/songs/midi/se_jitensya.o(.rodata); sound/songs/se_kouka_l.o(.rodata); sound/songs/se_kouka_m.o(.rodata); - sound/songs/se_kouka_h.o(.rodata); + sound/songs/midi/se_kouka_h.o(.rodata); sound/songs/midi/se_bowa2.o(.rodata); sound/songs/se_poke_dead.o(.rodata); sound/songs/se_nigeru.o(.rodata); @@ -942,5 +942,8 @@ $(MID_SUBDIR)/se_kon3.s: %.s: %.mid $(MID_SUBDIR)/se_kon4.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_kouka_h.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_kouka_h.mid b/sound/songs/midi/se_kouka_h.mid Binary files differnew file mode 100644 index 000000000..e70b12901 --- /dev/null +++ b/sound/songs/midi/se_kouka_h.mid diff --git a/sound/songs/se_kouka_h.s b/sound/songs/se_kouka_h.s deleted file mode 100644 index 955d3c077..000000000 --- a/sound/songs/se_kouka_h.s +++ /dev/null @@ -1,105 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kouka_h_grp, voicegroup127 - .equ se_kouka_h_pri, 5 - .equ se_kouka_h_rev, reverb_set+50 - .equ se_kouka_h_mvl, 127 - .equ se_kouka_h_key, 0 - .equ se_kouka_h_tbs, 1 - .equ se_kouka_h_exg, 0 - .equ se_kouka_h_cmp, 1 - - .section .rodata - .global se_kouka_h - .align 2 - -@********************** Track 1 **********************@ - -se_kouka_h_1: - .byte KEYSH , se_kouka_h_key+0 - .byte TEMPO , 90*se_kouka_h_tbs/2 - .byte VOICE , 125 - .byte VOL , 110*se_kouka_h_mvl/mxv - .byte N03 , Cn3 , v100 - .byte W03 - .byte An2 - .byte W03 - .byte Cn3 - .byte W03 - .byte N06 , Gn3 , v072 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v052 - .byte W03 - .byte N06 , Gn3 , v048 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v028 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte N03 , Cn3 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v012 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_kouka_h_2: - .byte KEYSH , se_kouka_h_key+0 - .byte VOICE , 0 - .byte VOL , 110*se_kouka_h_mvl/mxv - .byte N03 , Cn4 , v127 - .byte W03 - .byte Cn3 - .byte W03 - .byte Cn4 - .byte W03 - .byte N06 , Gn3 , v088 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v064 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v044 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v028 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v012 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_kouka_h: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kouka_h_pri @ Priority - .byte se_kouka_h_rev @ Reverb. - - .word se_kouka_h_grp - - .word se_kouka_h_1 - .word se_kouka_h_2 - - .end |