diff --git a/ld_script.txt b/ld_script.txt index 228bd2e7f9..8f9a17f9a0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -749,7 +749,7 @@ SECTIONS { sound/songs/midi/se_z_search.o(.rodata); sound/songs/midi/se_tamago.o(.rodata); sound/songs/se_tb_start.o(.rodata); - sound/songs/se_tb_kon.o(.rodata); + sound/songs/midi/se_tb_kon.o(.rodata); sound/songs/midi/se_tb_kara.o(.rodata); sound/songs/midi/se_bidoro.o(.rodata); sound/songs/se_w085.o(.rodata); diff --git a/songs.mk b/songs.mk index 30781e5606..9ae7161029 100644 --- a/songs.mk +++ b/songs.mk @@ -1116,5 +1116,8 @@ $(MID_SUBDIR)/se_tamakoro_e.s: %.s: %.mid $(MID_SUBDIR)/se_tb_kara.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 +$(MID_SUBDIR)/se_tb_kon.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_tb_kon.mid b/sound/songs/midi/se_tb_kon.mid new file mode 100644 index 0000000000..8526da9c67 Binary files /dev/null and b/sound/songs/midi/se_tb_kon.mid differ diff --git a/sound/songs/se_tb_kon.s b/sound/songs/se_tb_kon.s deleted file mode 100644 index 44ae71f3fb..0000000000 --- a/sound/songs/se_tb_kon.s +++ /dev/null @@ -1,48 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tb_kon_grp, voicegroup128 - .equ se_tb_kon_pri, 5 - .equ se_tb_kon_rev, reverb_set+50 - .equ se_tb_kon_mvl, 127 - .equ se_tb_kon_key, 0 - .equ se_tb_kon_tbs, 1 - .equ se_tb_kon_exg, 0 - .equ se_tb_kon_cmp, 1 - - .section .rodata - .global se_tb_kon - .align 2 - -@********************** Track 1 **********************@ - -se_tb_kon_1: - .byte KEYSH , se_tb_kon_key+0 - .byte TEMPO , 150*se_tb_kon_tbs/2 - .byte VOICE , 16 - .byte VOL , 110*se_tb_kon_mvl/mxv - .byte BEND , c_v+1 - .byte N03 , Gs4 , v072 - .byte W01 - .byte BEND , c_v-2 - .byte W01 - .byte VOL , 58*se_tb_kon_mvl/mxv - .byte BEND , c_v-10 - .byte W01 - .byte VOL , 28*se_tb_kon_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tb_kon: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tb_kon_pri @ Priority - .byte se_tb_kon_rev @ Reverb. - - .word se_tb_kon_grp - - .word se_tb_kon_1 - - .end