summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKermalis <29823718+Kermalis@users.noreply.github.com>2018-11-20 17:27:09 -0500
committerKermalis <29823718+Kermalis@users.noreply.github.com>2018-11-20 17:27:09 -0500
commit7746acfb1d1f840f85a67d476a11a57767552701 (patch)
tree1cb485d95b13200ba63b88c0108e9cf3fe97f7bd
parent3eff7efd8f0e5dc27ddf8c7c90a8fa1b287a933d (diff)
Match se_rg_help_cl.mid
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_rg_help_cl.midbin0 -> 233 bytes
-rw-r--r--sound/songs/se_rg_help_cl.s82
4 files changed, 4 insertions, 83 deletions
diff --git a/ld_script.txt b/ld_script.txt
index b7516fc1e..05d0508f6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -873,7 +873,7 @@ SECTIONS {
sound/songs/se_rg_shop.o(.rodata);
sound/songs/se_rg_kiteki.o(.rodata);
sound/songs/se_rg_help_op.o(.rodata);
- sound/songs/se_rg_help_cl.o(.rodata);
+ sound/songs/midi/se_rg_help_cl.o(.rodata);
sound/songs/se_rg_help_ng.o(.rodata);
sound/songs/midi/se_rg_deomov.o(.rodata);
sound/songs/midi/se_rg_excellent.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 7cef3a33c..01fc89933 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1032,5 +1032,8 @@ $(MID_SUBDIR)/se_rg_excellent.s: %.s: %.mid
$(MID_SUBDIR)/se_rg_getting.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
+$(MID_SUBDIR)/se_rg_help_cl.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V095 -P5
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_help_cl.mid b/sound/songs/midi/se_rg_help_cl.mid
new file mode 100644
index 000000000..c2c261252
--- /dev/null
+++ b/sound/songs/midi/se_rg_help_cl.mid
Binary files differ
diff --git a/sound/songs/se_rg_help_cl.s b/sound/songs/se_rg_help_cl.s
deleted file mode 100644
index 8daa70ae9..000000000
--- a/sound/songs/se_rg_help_cl.s
+++ /dev/null
@@ -1,82 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_rg_help_cl_grp, voicegroup129
- .equ se_rg_help_cl_pri, 5
- .equ se_rg_help_cl_rev, reverb_set+50
- .equ se_rg_help_cl_mvl, 127
- .equ se_rg_help_cl_key, 0
- .equ se_rg_help_cl_tbs, 1
- .equ se_rg_help_cl_exg, 0
- .equ se_rg_help_cl_cmp, 1
-
- .section .rodata
- .global se_rg_help_cl
- .align 2
-
-@********************** Track 1 **********************@
-
-se_rg_help_cl_1:
- .byte KEYSH , se_rg_help_cl_key+0
- .byte TEMPO , 420*se_rg_help_cl_tbs/2
- .byte VOICE , 24
- .byte LFOS , 44
- .byte BENDR , 12
- .byte VOL , 95*se_rg_help_cl_mvl/mxv
- .byte PAN , c_v+48
- .byte N04 , Dn5 , v092
- .byte W06
- .byte PAN , c_v-64
- .byte N04 , Dn5 , v032
- .byte W06
- .byte PAN , c_v+32
- .byte N04 , An4 , v096
- .byte W06
- .byte PAN , c_v+63
- .byte N04 , An4 , v032
- .byte W06
- .byte PAN , c_v+32
- .byte N04 , Fs4 , v092
- .byte W06
- .byte PAN , c_v-64
- .byte N04 , Fs4 , v032
- .byte W06
- .byte PAN , c_v+16
- .byte N04 , En4 , v092
- .byte W06
- .byte PAN , c_v+63
- .byte N04 , En4 , v032
- .byte W06
- .byte PAN , c_v-39
- .byte N04 , Dn4 , v096
- .byte W06
- .byte PAN , c_v+63
- .byte N04 , Dn4 , v032
- .byte W06
- .byte PAN , c_v-64
- .byte N04
- .byte W06
- .byte PAN , c_v+63
- .byte N04 , Dn4 , v016
- .byte W06
- .byte PAN , c_v-64
- .byte N04 , Dn4 , v012
- .byte W06
- .byte PAN , c_v+63
- .byte N04 , Dn4 , v004
- .byte W18
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_rg_help_cl:
- .byte 1 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_rg_help_cl_pri @ Priority
- .byte se_rg_help_cl_rev @ Reverb.
-
- .word se_rg_help_cl_grp
-
- .word se_rg_help_cl_1
-
- .end