summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKermalis <29823718+Kermalis@users.noreply.github.com>2018-10-10 14:27:30 -0400
committerKermalis <29823718+Kermalis@users.noreply.github.com>2018-10-10 14:27:30 -0400
commit005ac398fb8381c62baf42bba598aac19dfed8e2 (patch)
treeaf58930578a1ff0c65bfe58ff3f22a09921fd2e0
parent938c4a2bc699695526443e9c75112cd8b457c22a (diff)
Match se_ban.mid
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_ban.midbin0 -> 148 bytes
-rw-r--r--sound/songs/se_ban.s70
4 files changed, 4 insertions, 71 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 7814be677..5bbb215a1 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -584,7 +584,7 @@ SECTIONS {
sound/songs/se_nigeru.o(.rodata);
sound/songs/se_jido_doa.o(.rodata);
sound/songs/se_naminori.o(.rodata);
- sound/songs/se_ban.o(.rodata);
+ sound/songs/midi/se_ban.o(.rodata);
sound/songs/se_pin.o(.rodata);
sound/songs/se_boo.o(.rodata);
sound/songs/se_bowa.o(.rodata);
diff --git a/songs.mk b/songs.mk
index f2f358234..aa41d5c67 100644
--- a/songs.mk
+++ b/songs.mk
@@ -789,5 +789,8 @@ $(MID_SUBDIR)/ph_trap_solo.s: %.s: %.mid
$(MID_SUBDIR)/se_a.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4
+$(MID_SUBDIR)/se_ban.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_ban.mid b/sound/songs/midi/se_ban.mid
new file mode 100644
index 000000000..0722a1c36
--- /dev/null
+++ b/sound/songs/midi/se_ban.mid
Binary files differ
diff --git a/sound/songs/se_ban.s b/sound/songs/se_ban.s
deleted file mode 100644
index c4e39b5cd..000000000
--- a/sound/songs/se_ban.s
+++ /dev/null
@@ -1,70 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_ban_grp, voicegroup128
- .equ se_ban_pri, 4
- .equ se_ban_rev, reverb_set+50
- .equ se_ban_mvl, 127
- .equ se_ban_key, 0
- .equ se_ban_tbs, 1
- .equ se_ban_exg, 0
- .equ se_ban_cmp, 1
-
- .section .rodata
- .global se_ban
- .align 2
-
-@********************** Track 1 **********************@
-
-se_ban_1:
- .byte KEYSH , se_ban_key+0
- .byte TEMPO , 240*se_ban_tbs/2
- .byte VOICE , 2
- .byte BENDR , 12
- .byte VOL , 110*se_ban_mvl/mxv
- .byte BEND , c_v+0
- .byte N03 , En2 , v127
- .byte W03
- .byte Dn2
- .byte W03
- .byte N06 , Gn1
- .byte W06
- .byte N60 , An2
- .byte W12
- .byte W24
- .byte VOL , 94*se_ban_mvl/mxv
- .byte BEND , c_v-5
- .byte W03
- .byte VOL , 81*se_ban_mvl/mxv
- .byte W03
- .byte 71*se_ban_mvl/mxv
- .byte BEND , c_v-12
- .byte W03
- .byte VOL , 47*se_ban_mvl/mxv
- .byte W03
- .byte 32*se_ban_mvl/mxv
- .byte BEND , c_v-19
- .byte W03
- .byte VOL , 20*se_ban_mvl/mxv
- .byte W03
- .byte 7*se_ban_mvl/mxv
- .byte BEND , c_v-28
- .byte W03
- .byte VOL , 0*se_ban_mvl/mxv
- .byte BEND , c_v-37
- .byte W03
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_ban:
- .byte 1 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_ban_pri @ Priority
- .byte se_ban_rev @ Reverb.
-
- .word se_ban_grp
-
- .word se_ban_1
-
- .end