summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKermalis <29823718+Kermalis@users.noreply.github.com>2018-10-10 15:50:00 -0400
committerKermalis <29823718+Kermalis@users.noreply.github.com>2018-10-10 15:50:00 -0400
commit72366a320baf10820bb501733ce064a4d1a331d1 (patch)
tree4830182785e6ef7e97e8e82358b54eed77dfd5e6
parentf31e4914aa0d1a0fafa349cab365b7120b77bb78 (diff)
Match se_fu_zuzuzu.mid
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_fu_zuzuzu.midbin0 -> 140 bytes
-rw-r--r--sound/songs/se_fu_zuzuzu.s73
4 files changed, 4 insertions, 74 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 546d7cb2d..a28b20104 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -603,7 +603,7 @@ SECTIONS {
sound/songs/se_tk_kasya.o(.rodata);
sound/songs/midi/se_fu_zaku.o(.rodata);
sound/songs/midi/se_fu_zaku2.o(.rodata);
- sound/songs/se_fu_zuzuzu.o(.rodata);
+ sound/songs/midi/se_fu_zuzuzu.o(.rodata);
sound/songs/se_ru_gashin.o(.rodata);
sound/songs/se_ru_gasyan.o(.rodata);
sound/songs/se_ru_bari.o(.rodata);
diff --git a/songs.mk b/songs.mk
index e604ab965..4c60a2385 100644
--- a/songs.mk
+++ b/songs.mk
@@ -873,5 +873,8 @@ $(MID_SUBDIR)/se_fu_zaku.s: %.s: %.mid
$(MID_SUBDIR)/se_fu_zaku2.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4
+$(MID_SUBDIR)/se_fu_zuzuzu.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_fu_zuzuzu.mid b/sound/songs/midi/se_fu_zuzuzu.mid
new file mode 100644
index 000000000..962113ad3
--- /dev/null
+++ b/sound/songs/midi/se_fu_zuzuzu.mid
Binary files differ
diff --git a/sound/songs/se_fu_zuzuzu.s b/sound/songs/se_fu_zuzuzu.s
deleted file mode 100644
index b0df814d0..000000000
--- a/sound/songs/se_fu_zuzuzu.s
+++ /dev/null
@@ -1,73 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_fu_zuzuzu_grp, voicegroup127
- .equ se_fu_zuzuzu_pri, 4
- .equ se_fu_zuzuzu_rev, reverb_set+50
- .equ se_fu_zuzuzu_mvl, 127
- .equ se_fu_zuzuzu_key, 0
- .equ se_fu_zuzuzu_tbs, 1
- .equ se_fu_zuzuzu_exg, 0
- .equ se_fu_zuzuzu_cmp, 1
-
- .section .rodata
- .global se_fu_zuzuzu
- .align 2
-
-@********************** Track 1 **********************@
-
-se_fu_zuzuzu_1:
- .byte KEYSH , se_fu_zuzuzu_key+0
- .byte TEMPO , 120*se_fu_zuzuzu_tbs/2
- .byte VOICE , 126
- .byte VOL , 127*se_fu_zuzuzu_mvl/mxv
- .byte N08 , An2 , v112
- .byte W03
- .byte W03
- .byte W02
- .byte N01 , Gs2
- .byte W01
- .byte W01
- .byte N08 , An2 , v096
- .byte W02
- .byte W03
- .byte W03
- .byte W01
- .byte N01 , Gs2 , v092
- .byte W01
- .byte N08 , An2 , v080
- .byte W01
- .byte W03
- .byte W03
- .byte W02
- .byte N01 , Gs2 , v076
- .byte W01
- .byte N08 , An2 , v064
- .byte W03
- .byte W03
- .byte W03
- .byte N01 , Gs2 , v060
- .byte W02
- .byte N09 , An2 , v048
- .byte W01
- .byte W03
- .byte W03
- .byte W02
- .byte N01 , Gs2 , v040
- .byte W01
- .byte W03
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_fu_zuzuzu:
- .byte 1 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_fu_zuzuzu_pri @ Priority
- .byte se_fu_zuzuzu_rev @ Reverb.
-
- .word se_fu_zuzuzu_grp
-
- .word se_fu_zuzuzu_1
-
- .end