diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 15:59:49 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | c8a57d300761a4b103795a5ec4403ecd7b3d4b90 (patch) | |
| tree | 711c458e4117fb0039a72f10ae2c97fd156cc20a | |
| parent | d82b198820051cdcadee612f26028a64321bd687 (diff) | |
Match se_tb_kara.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_tb_kara.mid | bin | 0 -> 78 bytes | |||
| -rw-r--r-- | sound/songs/se_tb_kara.s | 43 |
4 files changed, 4 insertions, 44 deletions
diff --git a/ld_script.txt b/ld_script.txt index 41d1a468d..228bd2e7f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -750,7 +750,7 @@ SECTIONS { sound/songs/midi/se_tamago.o(.rodata); sound/songs/se_tb_start.o(.rodata); sound/songs/se_tb_kon.o(.rodata); - sound/songs/se_tb_kara.o(.rodata); + sound/songs/midi/se_tb_kara.o(.rodata); sound/songs/midi/se_bidoro.o(.rodata); sound/songs/se_w085.o(.rodata); sound/songs/se_w085b.o(.rodata); @@ -1113,5 +1113,8 @@ $(MID_SUBDIR)/se_tamakoro.s: %.s: %.mid $(MID_SUBDIR)/se_tamakoro_e.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P2 +$(MID_SUBDIR)/se_tb_kara.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_tb_kara.mid b/sound/songs/midi/se_tb_kara.mid Binary files differnew file mode 100644 index 000000000..a4c2a51d7 --- /dev/null +++ b/sound/songs/midi/se_tb_kara.mid diff --git a/sound/songs/se_tb_kara.s b/sound/songs/se_tb_kara.s deleted file mode 100644 index 2b5772256..000000000 --- a/sound/songs/se_tb_kara.s +++ /dev/null @@ -1,43 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tb_kara_grp, voicegroup127 - .equ se_tb_kara_pri, 5 - .equ se_tb_kara_rev, reverb_set+50 - .equ se_tb_kara_mvl, 127 - .equ se_tb_kara_key, 0 - .equ se_tb_kara_tbs, 1 - .equ se_tb_kara_exg, 0 - .equ se_tb_kara_cmp, 1 - - .section .rodata - .global se_tb_kara - .align 2 - -@********************** Track 1 **********************@ - -se_tb_kara_1: - .byte KEYSH , se_tb_kara_key+0 - .byte TEMPO , 150*se_tb_kara_tbs/2 - .byte VOICE , 119 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 100*se_tb_kara_mvl/mxv - .byte BEND , c_v+1 - .byte N02 , Gs4 , v040 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tb_kara: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tb_kara_pri @ Priority - .byte se_tb_kara_rev @ Reverb. - - .word se_tb_kara_grp - - .word se_tb_kara_1 - - .end |