summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_c_gaji.midbin0 -> 80 bytes
-rw-r--r--sound/songs/se_c_gaji.s44
4 files changed, 4 insertions, 45 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 40310951e..132cf6746 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -660,7 +660,7 @@ SECTIONS {
sound/songs/se_tamakoro_e.o(.rodata);
sound/songs/midi/se_basabasa.o(.rodata);
sound/songs/se_regi.o(.rodata);
- sound/songs/se_c_gaji.o(.rodata);
+ sound/songs/midi/se_c_gaji.o(.rodata);
sound/songs/se_c_maku_u.o(.rodata);
sound/songs/se_c_maku_d.o(.rodata);
sound/songs/se_c_pasi.o(.rodata);
diff --git a/songs.mk b/songs.mk
index de0af58b0..aff7937d5 100644
--- a/songs.mk
+++ b/songs.mk
@@ -810,5 +810,8 @@ $(MID_SUBDIR)/se_bowa2.s: %.s: %.mid
$(MID_SUBDIR)/se_bt_start.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
+$(MID_SUBDIR)/se_c_gaji.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_c_gaji.mid b/sound/songs/midi/se_c_gaji.mid
new file mode 100644
index 000000000..94b6389b7
--- /dev/null
+++ b/sound/songs/midi/se_c_gaji.mid
Binary files differ
diff --git a/sound/songs/se_c_gaji.s b/sound/songs/se_c_gaji.s
deleted file mode 100644
index 38217dbe5..000000000
--- a/sound/songs/se_c_gaji.s
+++ /dev/null
@@ -1,44 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_c_gaji_grp, voicegroup128
- .equ se_c_gaji_pri, 5
- .equ se_c_gaji_rev, reverb_set+50
- .equ se_c_gaji_mvl, 127
- .equ se_c_gaji_key, 0
- .equ se_c_gaji_tbs, 1
- .equ se_c_gaji_exg, 0
- .equ se_c_gaji_cmp, 1
-
- .section .rodata
- .global se_c_gaji
- .align 2
-
-@********************** Track 1 **********************@
-
-se_c_gaji_1:
- .byte KEYSH , se_c_gaji_key+0
- .byte TEMPO , 150*se_c_gaji_tbs/2
- .byte VOICE , 14
- .byte VOL , 90*se_c_gaji_mvl/mxv
- .byte BEND , c_v-7
- .byte N02 , Cn5 , v112
- .byte W02
- .byte N09 , Gn4
- .byte W04
- .byte W06
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_c_gaji:
- .byte 1 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_c_gaji_pri @ Priority
- .byte se_c_gaji_rev @ Reverb.
-
- .word se_c_gaji_grp
-
- .word se_c_gaji_1
-
- .end