summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKermalis <29823718+Kermalis@users.noreply.github.com>2019-03-24 16:34:00 -0400
committerhuderlem <huderlem@gmail.com>2019-03-24 16:37:27 -0500
commit6437f9fb15be521793eb14135207a4f57221a9ac (patch)
tree9116b70a1da195c518e115d09713a0158b281e94
parentfb297ca1c0694a673eaf172905ff6eda6e6adf4e (diff)
Match se_tu_saa.mid
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_tu_saa.midbin0 -> 96 bytes
-rw-r--r--sound/songs/se_tu_saa.s55
4 files changed, 4 insertions, 56 deletions
diff --git a/ld_script.txt b/ld_script.txt
index ffb7c2226..3d80eed76 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -681,7 +681,7 @@ SECTIONS {
sound/songs/midi/se_ki_gasyan.o(.rodata);
sound/songs/midi/se_tk_warpin.o(.rodata);
sound/songs/midi/se_tk_warpout.o(.rodata);
- sound/songs/se_tu_saa.o(.rodata);
+ sound/songs/midi/se_tu_saa.o(.rodata);
sound/songs/midi/se_hi_turun.o(.rodata);
sound/songs/midi/se_track_move.o(.rodata);
sound/songs/midi/se_track_stop.o(.rodata);
diff --git a/songs.mk b/songs.mk
index f2a6f44e2..aaacea72b 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1179,5 +1179,8 @@ $(MID_SUBDIR)/se_track_move.s: %.s: %.mid
$(MID_SUBDIR)/se_track_stop.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4
+$(MID_SUBDIR)/se_tu_saa.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_tu_saa.mid b/sound/songs/midi/se_tu_saa.mid
new file mode 100644
index 000000000..c84b176cb
--- /dev/null
+++ b/sound/songs/midi/se_tu_saa.mid
Binary files differ
diff --git a/sound/songs/se_tu_saa.s b/sound/songs/se_tu_saa.s
deleted file mode 100644
index c9346509c..000000000
--- a/sound/songs/se_tu_saa.s
+++ /dev/null
@@ -1,55 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_tu_saa_grp, voicegroup127
- .equ se_tu_saa_pri, 4
- .equ se_tu_saa_rev, reverb_set+50
- .equ se_tu_saa_mvl, 127
- .equ se_tu_saa_key, 0
- .equ se_tu_saa_tbs, 1
- .equ se_tu_saa_exg, 0
- .equ se_tu_saa_cmp, 1
-
- .section .rodata
- .global se_tu_saa
- .align 2
-
-@********************** Track 1 **********************@
-
-se_tu_saa_1:
- .byte KEYSH , se_tu_saa_key+0
- .byte TEMPO , 220*se_tu_saa_tbs/2
- .byte VOICE , 123
- .byte VOL , 90*se_tu_saa_mvl/mxv
- .byte N03 , Cn4 , v060
- .byte W03
- .byte VOL , 62*se_tu_saa_mvl/mxv
- .byte N32 , Gs4
- .byte W03
- .byte VOL , 68*se_tu_saa_mvl/mxv
- .byte W03
- .byte 72*se_tu_saa_mvl/mxv
- .byte W03
- .byte 78*se_tu_saa_mvl/mxv
- .byte W03
- .byte 85*se_tu_saa_mvl/mxv
- .byte W03
- .byte 90*se_tu_saa_mvl/mxv
- .byte W06
- .byte W06
- .byte W06
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_tu_saa:
- .byte 1 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_tu_saa_pri @ Priority
- .byte se_tu_saa_rev @ Reverb.
-
- .word se_tu_saa_grp
-
- .word se_tu_saa_1
-
- .end