summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_reapoke.midbin0 -> 257 bytes
-rw-r--r--sound/songs/se_reapoke.s106
4 files changed, 4 insertions, 107 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 59c0d3fb0..59f7811cd 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -717,7 +717,7 @@ SECTIONS {
sound/songs/midi/se_c_pasi.o(.rodata);
sound/songs/midi/se_c_syu.o(.rodata);
sound/songs/midi/se_c_pikon.o(.rodata);
- sound/songs/se_reapoke.o(.rodata);
+ sound/songs/midi/se_reapoke.o(.rodata);
sound/songs/midi/se_op_basyu.o(.rodata);
sound/songs/midi/se_bt_start.o(.rodata);
sound/songs/midi/se_dendou.o(.rodata);
diff --git a/songs.mk b/songs.mk
index e46b9e1f0..2c0f87310 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1002,5 +1002,8 @@ $(MID_SUBDIR)/se_pn_on.s: %.s: %.mid
$(MID_SUBDIR)/se_poke_dead.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
+$(MID_SUBDIR)/se_reapoke.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P5
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_reapoke.mid b/sound/songs/midi/se_reapoke.mid
new file mode 100644
index 000000000..b9a4fe810
--- /dev/null
+++ b/sound/songs/midi/se_reapoke.mid
Binary files differ
diff --git a/sound/songs/se_reapoke.s b/sound/songs/se_reapoke.s
deleted file mode 100644
index 11415920b..000000000
--- a/sound/songs/se_reapoke.s
+++ /dev/null
@@ -1,106 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_reapoke_grp, voicegroup128
- .equ se_reapoke_pri, 5
- .equ se_reapoke_rev, reverb_set+50
- .equ se_reapoke_mvl, 127
- .equ se_reapoke_key, 0
- .equ se_reapoke_tbs, 1
- .equ se_reapoke_exg, 0
- .equ se_reapoke_cmp, 1
-
- .section .rodata
- .global se_reapoke
- .align 2
-
-@********************** Track 1 **********************@
-
-se_reapoke_1:
- .byte KEYSH , se_reapoke_key+0
- .byte TEMPO , 220*se_reapoke_tbs/2
- .byte VOICE , 46
- .byte VOL , 95*se_reapoke_mvl/mxv
- .byte BENDR , 12
- .byte PAN , c_v+0
- .byte BEND , c_v+1
- .byte N03 , Cn6 , v127
- .byte W01
- .byte PAN , c_v+2
- .byte BEND , c_v+2
- .byte W01
- .byte c_v+4
- .byte W01
- .byte c_v+1
- .byte N06 , Gn6
- .byte W01
- .byte PAN , c_v+0
- .byte W02
- .byte W03
- .byte BEND , c_v+1
- .byte N03 , Cn6 , v104
- .byte W01
- .byte PAN , c_v-2
- .byte BEND , c_v+2
- .byte W02
- .byte c_v+4
- .byte W01
- .byte c_v+1
- .byte N06 , Gn6
- .byte W01
- .byte PAN , c_v+0
- .byte W04
- .byte W01
- .byte BEND , c_v+1
- .byte N03 , Cs6 , v080
- .byte W01
- .byte PAN , c_v+4
- .byte BEND , c_v+2
- .byte W01
- .byte c_v+4
- .byte W01
- .byte c_v+1
- .byte N06 , Gs6
- .byte W02
- .byte PAN , c_v+0
- .byte W04
- .byte BEND , c_v+1
- .byte N03 , Cs6 , v048
- .byte W02
- .byte PAN , c_v-5
- .byte BEND , c_v+2
- .byte W01
- .byte c_v+4
- .byte W01
- .byte c_v+1
- .byte N06 , Gs6
- .byte W01
- .byte PAN , c_v+0
- .byte W03
- .byte W02
- .byte c_v+4
- .byte BEND , c_v+1
- .byte N03 , Cs6 , v032
- .byte W01
- .byte BEND , c_v+2
- .byte W01
- .byte c_v+4
- .byte W02
- .byte c_v+0
- .byte N06 , Gs6
- .byte W06
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_reapoke:
- .byte 1 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_reapoke_pri @ Priority
- .byte se_reapoke_rev @ Reverb.
-
- .word se_reapoke_grp
-
- .word se_reapoke_1
-
- .end