diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 16:17:07 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 16:17:07 -0400 |
| commit | 2f21d2e9aba36fc762c81187790e731ed6031079 (patch) | |
| tree | 4aa1ddb1829e69bdc1d741af968880f1cc3ef205 | |
| parent | 27f2b3b00ab6cda07d6a5033ae21e44fde15e78b (diff) | |
Match se_jido_doa.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_jido_doa.mid | bin | 0 -> 72 bytes | |||
| -rw-r--r-- | sound/songs/se_jido_doa.s | 41 |
4 files changed, 4 insertions, 42 deletions
diff --git a/ld_script.txt b/ld_script.txt index 7722ba540..8d5181259 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -582,7 +582,7 @@ SECTIONS { sound/songs/midi/se_bowa2.o(.rodata); sound/songs/se_poke_dead.o(.rodata); sound/songs/se_nigeru.o(.rodata); - sound/songs/se_jido_doa.o(.rodata); + sound/songs/midi/se_jido_doa.o(.rodata); sound/songs/se_naminori.o(.rodata); sound/songs/midi/se_ban.o(.rodata); sound/songs/se_pin.o(.rodata); @@ -906,5 +906,8 @@ $(MID_SUBDIR)/se_hinsi.s: %.s: %.mid $(MID_SUBDIR)/se_i.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 +$(MID_SUBDIR)/se_jido_doa.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_jido_doa.mid b/sound/songs/midi/se_jido_doa.mid Binary files differnew file mode 100644 index 000000000..62fa8c911 --- /dev/null +++ b/sound/songs/midi/se_jido_doa.mid diff --git a/sound/songs/se_jido_doa.s b/sound/songs/se_jido_doa.s deleted file mode 100644 index 60a1e4a47..000000000 --- a/sound/songs/se_jido_doa.s +++ /dev/null @@ -1,41 +0,0 @@ - .include "MPlayDef.s" - - .equ se_jido_doa_grp, voicegroup128 - .equ se_jido_doa_pri, 4 - .equ se_jido_doa_rev, reverb_set+50 - .equ se_jido_doa_mvl, 127 - .equ se_jido_doa_key, 0 - .equ se_jido_doa_tbs, 1 - .equ se_jido_doa_exg, 0 - .equ se_jido_doa_cmp, 1 - - .section .rodata - .global se_jido_doa - .align 2 - -@********************** Track 1 **********************@ - -se_jido_doa_1: - .byte KEYSH , se_jido_doa_key+0 - .byte TEMPO , 120*se_jido_doa_tbs/2 - .byte VOICE , 1 - .byte VOL , 95*se_jido_doa_mvl/mxv - .byte N12 , Cn2 , v127 - .byte W12 - .byte VOL , 0*se_jido_doa_mvl/mxv - .byte FINE - -@******************************************************@ - .align 2 - -se_jido_doa: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_jido_doa_pri @ Priority - .byte se_jido_doa_rev @ Reverb. - - .word se_jido_doa_grp - - .word se_jido_doa_1 - - .end |