summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_card.midbin0 -> 184 bytes
-rw-r--r--sound/songs/se_card.s84
4 files changed, 4 insertions, 85 deletions
diff --git a/ld_script.txt b/ld_script.txt
index cc3823cbc..ed5665470 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -618,7 +618,7 @@ SECTIONS {
sound/songs/se_track_haiki.o(.rodata);
sound/songs/se_track_door.o(.rodata);
sound/songs/se_moter.o(.rodata);
- sound/songs/se_card.o(.rodata);
+ sound/songs/midi/se_card.o(.rodata);
sound/songs/se_save.o(.rodata);
sound/songs/se_kon.o(.rodata);
sound/songs/se_kon2.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 7c2b9b583..ad1b28f27 100644
--- a/songs.mk
+++ b/songs.mk
@@ -828,5 +828,8 @@ $(MID_SUBDIR)/se_c_pikon.s: %.s: %.mid
$(MID_SUBDIR)/se_c_syu.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
+$(MID_SUBDIR)/se_card.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_card.mid b/sound/songs/midi/se_card.mid
new file mode 100644
index 000000000..a6832a85f
--- /dev/null
+++ b/sound/songs/midi/se_card.mid
Binary files differ
diff --git a/sound/songs/se_card.s b/sound/songs/se_card.s
deleted file mode 100644
index 703e516d5..000000000
--- a/sound/songs/se_card.s
+++ /dev/null
@@ -1,84 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_card_grp, voicegroup127
- .equ se_card_pri, 4
- .equ se_card_rev, reverb_set+50
- .equ se_card_mvl, 127
- .equ se_card_key, 0
- .equ se_card_tbs, 1
- .equ se_card_exg, 0
- .equ se_card_cmp, 1
-
- .section .rodata
- .global se_card
- .align 2
-
-@********************** Track 1 **********************@
-
-se_card_1:
- .byte KEYSH , se_card_key+0
- .byte TEMPO , 180*se_card_tbs/2
- .byte VOICE , 2
- .byte BENDR , 12
- .byte VOL , 37*se_card_mvl/mxv
- .byte BEND , c_v+63
- .byte N02 , Gn3 , v044
- .byte W01
- .byte VOL , 73*se_card_mvl/mxv
- .byte W01
- .byte 100*se_card_mvl/mxv
- .byte N01 , Gn4
- .byte W02
- .byte N30 , Cn4 , v127
- .byte W02
- .byte BEND , c_v+59
- .byte W01
- .byte VOL , 3*se_card_mvl/mxv
- .byte W01
- .byte 25*se_card_mvl/mxv
- .byte W01
- .byte 56*se_card_mvl/mxv
- .byte BEND , c_v+55
- .byte W01
- .byte VOL , 77*se_card_mvl/mxv
- .byte W02
- .byte 100*se_card_mvl/mxv
- .byte BEND , c_v+46
- .byte W03
- .byte VOL , 92*se_card_mvl/mxv
- .byte BEND , c_v+37
- .byte W03
- .byte VOL , 79*se_card_mvl/mxv
- .byte BEND , c_v+28
- .byte W03
- .byte VOL , 66*se_card_mvl/mxv
- .byte BEND , c_v+20
- .byte W03
- .byte VOL , 52*se_card_mvl/mxv
- .byte BEND , c_v+11
- .byte W03
- .byte VOL , 38*se_card_mvl/mxv
- .byte BEND , c_v+2
- .byte W03
- .byte VOL , 25*se_card_mvl/mxv
- .byte BEND , c_v-7
- .byte W03
- .byte VOL , 11*se_card_mvl/mxv
- .byte BEND , c_v-16
- .byte W03
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_card:
- .byte 1 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_card_pri @ Priority
- .byte se_card_rev @ Reverb.
-
- .word se_card_grp
-
- .word se_card_1
-
- .end