summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_rg_nawamiss.midbin0 -> 99 bytes
-rw-r--r--sound/songs/se_rg_nawamiss.s55
4 files changed, 4 insertions, 56 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 0b404fba4..46cb47800 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -877,7 +877,7 @@ SECTIONS {
sound/songs/midi/se_rg_help_ng.o(.rodata);
sound/songs/midi/se_rg_deomov.o(.rodata);
sound/songs/midi/se_rg_excellent.o(.rodata);
- sound/songs/se_rg_nawamiss.o(.rodata);
+ sound/songs/midi/se_rg_nawamiss.o(.rodata);
sound/songs/se_toreeye.o(.rodata);
sound/songs/se_toreoff.o(.rodata);
sound/songs/midi/se_hantei1.o(.rodata);
diff --git a/songs.mk b/songs.mk
index cdf05ee6c..4fed6d158 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1044,5 +1044,8 @@ $(MID_SUBDIR)/se_rg_help_op.s: %.s: %.mid
$(MID_SUBDIR)/se_rg_kiteki.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5
+$(MID_SUBDIR)/se_rg_nawamiss.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_nawamiss.mid b/sound/songs/midi/se_rg_nawamiss.mid
new file mode 100644
index 000000000..c3c52f88f
--- /dev/null
+++ b/sound/songs/midi/se_rg_nawamiss.mid
Binary files differ
diff --git a/sound/songs/se_rg_nawamiss.s b/sound/songs/se_rg_nawamiss.s
deleted file mode 100644
index db24cf5f4..000000000
--- a/sound/songs/se_rg_nawamiss.s
+++ /dev/null
@@ -1,55 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_rg_nawamiss_grp, voicegroup127
- .equ se_rg_nawamiss_pri, 5
- .equ se_rg_nawamiss_rev, reverb_set+50
- .equ se_rg_nawamiss_mvl, 127
- .equ se_rg_nawamiss_key, 0
- .equ se_rg_nawamiss_tbs, 1
- .equ se_rg_nawamiss_exg, 0
- .equ se_rg_nawamiss_cmp, 1
-
- .section .rodata
- .global se_rg_nawamiss
- .align 2
-
-@********************** Track 1 **********************@
-
-se_rg_nawamiss_1:
- .byte KEYSH , se_rg_nawamiss_key+0
- .byte TEMPO , 240*se_rg_nawamiss_tbs/2
- .byte VOICE , 92
- .byte BENDR , 12
- .byte VOL , 127*se_rg_nawamiss_mvl/mxv
- .byte BEND , c_v+0
- .byte N03 , Cn2 , v127
- .byte W03
- .byte Cn2 , v020
- .byte W03
- .byte N18 , Cn2 , v127
- .byte W03
- .byte W03
- .byte W03
- .byte W03
- .byte W03
- .byte W03
- .byte N09 , Cn2 , v020
- .byte W03
- .byte W03
- .byte W03
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_rg_nawamiss:
- .byte 1 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_rg_nawamiss_pri @ Priority
- .byte se_rg_nawamiss_rev @ Reverb.
-
- .word se_rg_nawamiss_grp
-
- .word se_rg_nawamiss_1
-
- .end