summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKermalis <29823718+Kermalis@users.noreply.github.com>2018-11-20 18:01:10 -0500
committerKermalis <29823718+Kermalis@users.noreply.github.com>2018-11-20 18:01:10 -0500
commit5395fc8b57c204c6d334311a549f817c10192b74 (patch)
treedceb33607896df1fba6399cdcc3ec852033137bb
parent25d4702ac4b420c288b209eb4f8ff3c9c1143b8d (diff)
Match se_t_koame.mid
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_t_koame.midbin0 -> 118 bytes
-rw-r--r--sound/songs/se_t_koame.s65
4 files changed, 4 insertions, 66 deletions
diff --git a/ld_script.txt b/ld_script.txt
index f9d8210a6..a12d5b16a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -700,7 +700,7 @@ SECTIONS {
sound/songs/se_t_ame_e.o(.rodata);
sound/songs/se_t_ooame.o(.rodata);
sound/songs/se_t_ooame_e.o(.rodata);
- sound/songs/se_t_koame.o(.rodata);
+ sound/songs/midi/se_t_koame.o(.rodata);
sound/songs/se_t_koame_e.o(.rodata);
sound/songs/se_t_kami.o(.rodata);
sound/songs/se_t_kami2.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 1f5087f9c..9617ce0bd 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1080,5 +1080,8 @@ $(MID_SUBDIR)/se_suikomu.s: %.s: %.mid
$(MID_SUBDIR)/se_t_ame.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
+$(MID_SUBDIR)/se_t_koame.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_t_koame.mid b/sound/songs/midi/se_t_koame.mid
new file mode 100644
index 000000000..d8491b293
--- /dev/null
+++ b/sound/songs/midi/se_t_koame.mid
Binary files differ
diff --git a/sound/songs/se_t_koame.s b/sound/songs/se_t_koame.s
deleted file mode 100644
index 6a7acdbf5..000000000
--- a/sound/songs/se_t_koame.s
+++ /dev/null
@@ -1,65 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_t_koame_grp, voicegroup128
- .equ se_t_koame_pri, 2
- .equ se_t_koame_rev, reverb_set+50
- .equ se_t_koame_mvl, 127
- .equ se_t_koame_key, 0
- .equ se_t_koame_tbs, 1
- .equ se_t_koame_exg, 0
- .equ se_t_koame_cmp, 1
-
- .section .rodata
- .global se_t_koame
- .align 2
-
-@********************** Track 1 **********************@
-
-se_t_koame_1:
- .byte KEYSH , se_t_koame_key+0
- .byte TEMPO , 220*se_t_koame_tbs/2
- .byte VOICE , 36
- .byte BENDR , 12
- .byte PAN , c_v+0
- .byte VOL , 15*se_t_koame_mvl/mxv
- .byte BEND , c_v+0
- .byte N24 , Bn3 , v052
- .byte W03
- .byte VOL , 27*se_t_koame_mvl/mxv
- .byte W03
- .byte 39*se_t_koame_mvl/mxv
- .byte W03
- .byte 44*se_t_koame_mvl/mxv
- .byte W03
- .byte 52*se_t_koame_mvl/mxv
- .byte W03
- .byte 59*se_t_koame_mvl/mxv
- .byte W03
- .byte 68*se_t_koame_mvl/mxv
- .byte W03
- .byte 80*se_t_koame_mvl/mxv
- .byte W03
-se_t_koame_1_B1:
- .byte N60 , Bn3 , v052
- .byte W24
- .byte W24
- .byte W12
- .byte GOTO
- .word se_t_koame_1_B1
- .byte W12
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_t_koame:
- .byte 1 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_t_koame_pri @ Priority
- .byte se_t_koame_rev @ Reverb.
-
- .word se_t_koame_grp
-
- .word se_t_koame_1
-
- .end