summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_elebeta.midbin0 -> 104 bytes
-rw-r--r--sound/songs/se_elebeta.s71
4 files changed, 4 insertions, 72 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 964b3148e..cb244a70e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -653,7 +653,7 @@ SECTIONS {
sound/songs/se_t_koame_e.o(.rodata);
sound/songs/se_t_kami.o(.rodata);
sound/songs/se_t_kami2.o(.rodata);
- sound/songs/se_elebeta.o(.rodata);
+ sound/songs/midi/se_elebeta.o(.rodata);
sound/songs/se_hinsi.o(.rodata);
sound/songs/se_expmax.o(.rodata);
sound/songs/se_tamakoro.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 131183fa7..c7af5bc13 100644
--- a/songs.mk
+++ b/songs.mk
@@ -855,5 +855,8 @@ $(MID_SUBDIR)/se_door.s: %.s: %.mid
$(MID_SUBDIR)/se_e.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
+$(MID_SUBDIR)/se_elebeta.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_elebeta.mid b/sound/songs/midi/se_elebeta.mid
new file mode 100644
index 000000000..66ee5fd1f
--- /dev/null
+++ b/sound/songs/midi/se_elebeta.mid
Binary files differ
diff --git a/sound/songs/se_elebeta.s b/sound/songs/se_elebeta.s
deleted file mode 100644
index ad19476d5..000000000
--- a/sound/songs/se_elebeta.s
+++ /dev/null
@@ -1,71 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_elebeta_grp, voicegroup128
- .equ se_elebeta_pri, 4
- .equ se_elebeta_rev, reverb_set+50
- .equ se_elebeta_mvl, 127
- .equ se_elebeta_key, 0
- .equ se_elebeta_tbs, 1
- .equ se_elebeta_exg, 0
- .equ se_elebeta_cmp, 1
-
- .section .rodata
- .global se_elebeta
- .align 2
-
-@********************** Track 1 **********************@
-
-se_elebeta_1:
- .byte KEYSH , se_elebeta_key+0
- .byte TEMPO , 150*se_elebeta_tbs/2
- .byte VOICE , 38
- .byte BENDR , 2
- .byte VOL , 100*se_elebeta_mvl/mxv
- .byte BEND , c_v+0
- .byte TIE , Fs4 , v080
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte EOT
- .byte FINE
-
-@********************** Track 2 **********************@
-
-se_elebeta_2:
- .byte KEYSH , se_elebeta_key+0
- .byte VOICE , 27
- .byte VOL , 100*se_elebeta_mvl/mxv
- .byte TIE , Fn3 , v032
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte EOT
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_elebeta:
- .byte 2 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_elebeta_pri @ Priority
- .byte se_elebeta_rev @ Reverb.
-
- .word se_elebeta_grp
-
- .word se_elebeta_1
- .word se_elebeta_2
-
- .end