diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:03:47 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:03:47 -0500 |
| commit | d400b28edba2e4a44831a3c43deb102f6074f1e9 (patch) | |
| tree | 3f2877a865ec92c27d7a7e4f7848f37cd6cba1b8 | |
| parent | 6b6e1882e4ceacd3b99eaefd19bbf5f96312f6c1 (diff) | |
Match se_rg_bag2.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_rg_bag2.mid | bin | 0 -> 145 bytes | |||
| -rw-r--r-- | sound/songs/se_rg_bag2.s | 65 |
4 files changed, 4 insertions, 66 deletions
diff --git a/ld_script.txt b/ld_script.txt index 45a2c2368..df39a16d3 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -868,7 +868,7 @@ SECTIONS { sound/songs/se_rg_card2.o(.rodata); sound/songs/se_rg_card3.o(.rodata); sound/songs/midi/se_rg_bag1.o(.rodata); - sound/songs/se_rg_bag2.o(.rodata); + sound/songs/midi/se_rg_bag2.o(.rodata); sound/songs/se_rg_getting.o(.rodata); sound/songs/se_rg_shop.o(.rodata); sound/songs/se_rg_kiteki.o(.rodata); @@ -1011,5 +1011,8 @@ $(MID_SUBDIR)/se_regi.s: %.s: %.mid $(MID_SUBDIR)/se_rg_bag1.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 +$(MID_SUBDIR)/se_rg_bag2.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_rg_bag2.mid b/sound/songs/midi/se_rg_bag2.mid Binary files differnew file mode 100644 index 000000000..97a5b32df --- /dev/null +++ b/sound/songs/midi/se_rg_bag2.mid diff --git a/sound/songs/se_rg_bag2.s b/sound/songs/se_rg_bag2.s deleted file mode 100644 index 7d4f338c5..000000000 --- a/sound/songs/se_rg_bag2.s +++ /dev/null @@ -1,65 +0,0 @@ - .include "MPlayDef.s" - - .equ se_rg_bag2_grp, voicegroup129 - .equ se_rg_bag2_pri, 5 - .equ se_rg_bag2_rev, reverb_set+50 - .equ se_rg_bag2_mvl, 127 - .equ se_rg_bag2_key, 0 - .equ se_rg_bag2_tbs, 1 - .equ se_rg_bag2_exg, 0 - .equ se_rg_bag2_cmp, 1 - - .section .rodata - .global se_rg_bag2 - .align 2 - -@********************** Track 1 **********************@ - -se_rg_bag2_1: - .byte KEYSH , se_rg_bag2_key+0 - .byte TEMPO , 422*se_rg_bag2_tbs/2 - .byte VOICE , 80 - .byte VOL , 64*se_rg_bag2_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Dn4 , v084 - .byte W02 - .byte BEND , c_v+17 - .byte N03 , Fs4 , v080 - .byte W01 - .byte BEND , c_v-40 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_rg_bag2_2: - .byte KEYSH , se_rg_bag2_key+0 - .byte VOICE , 2 - .byte XCMD , xIECV , 8 - .byte xIECL , 8 - .byte VOL , 127*se_rg_bag2_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N04 , En3 , v127 - .byte W03 - .byte W01 - .byte VOICE , 2 - .byte N02 , Bn3 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_rg_bag2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_rg_bag2_pri @ Priority - .byte se_rg_bag2_rev @ Reverb. - - .word se_rg_bag2_grp - - .word se_rg_bag2_1 - .word se_rg_bag2_2 - - .end |