summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_jite_pyoko.midbin0 -> 83 bytes
-rw-r--r--sound/songs/se_jite_pyoko.s45
4 files changed, 4 insertions, 46 deletions
diff --git a/ld_script.txt b/ld_script.txt
index d67a65052..763d4ba4c 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -598,7 +598,7 @@ SECTIONS {
sound/songs/se_seikai.o(.rodata);
sound/songs/midi/se_hazure.o(.rodata);
sound/songs/midi/se_exp.o(.rodata);
- sound/songs/se_jite_pyoko.o(.rodata);
+ sound/songs/midi/se_jite_pyoko.o(.rodata);
sound/songs/se_mu_pachi.o(.rodata);
sound/songs/se_tk_kasya.o(.rodata);
sound/songs/midi/se_fu_zaku.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 437a22857..c4f5a50d8 100644
--- a/songs.mk
+++ b/songs.mk
@@ -912,5 +912,8 @@ $(MID_SUBDIR)/se_jido_doa.s: %.s: %.mid
$(MID_SUBDIR)/se_jihanki.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
+$(MID_SUBDIR)/se_jite_pyoko.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_jite_pyoko.mid b/sound/songs/midi/se_jite_pyoko.mid
new file mode 100644
index 000000000..013be8590
--- /dev/null
+++ b/sound/songs/midi/se_jite_pyoko.mid
Binary files differ
diff --git a/sound/songs/se_jite_pyoko.s b/sound/songs/se_jite_pyoko.s
deleted file mode 100644
index 36dbcf83b..000000000
--- a/sound/songs/se_jite_pyoko.s
+++ /dev/null
@@ -1,45 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_jite_pyoko_grp, voicegroup127
- .equ se_jite_pyoko_pri, 4
- .equ se_jite_pyoko_rev, reverb_set+50
- .equ se_jite_pyoko_mvl, 127
- .equ se_jite_pyoko_key, 0
- .equ se_jite_pyoko_tbs, 1
- .equ se_jite_pyoko_exg, 0
- .equ se_jite_pyoko_cmp, 1
-
- .section .rodata
- .global se_jite_pyoko
- .align 2
-
-@********************** Track 1 **********************@
-
-se_jite_pyoko_1:
- .byte KEYSH , se_jite_pyoko_key+0
- .byte TEMPO , 180*se_jite_pyoko_tbs/2
- .byte VOICE , 85
- .byte VOL , 90*se_jite_pyoko_mvl/mxv
- .byte BEND , c_v-6
- .byte N02 , Cn3 , v080
- .byte W02
- .byte VOICE , 86
- .byte N03 , Cn4 , v127
- .byte W01
- .byte W03
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_jite_pyoko:
- .byte 1 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_jite_pyoko_pri @ Priority
- .byte se_jite_pyoko_rev @ Reverb.
-
- .word se_jite_pyoko_grp
-
- .word se_jite_pyoko_1
-
- .end