diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:05:11 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:05:11 -0500 |
| commit | 499de4f7c6b8692fa0b89f600c305df9f0dcd1e2 (patch) | |
| tree | 3033dc7b4c26a043d8def0ee0ceb79e58ff2a0b2 | |
| parent | d400b28edba2e4a44831a3c43deb102f6074f1e9 (diff) | |
Match se_rg_card1.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_rg_card1.mid | bin | 0 -> 98 bytes | |||
| -rw-r--r-- | sound/songs/se_rg_card1.s | 48 |
4 files changed, 4 insertions, 49 deletions
diff --git a/ld_script.txt b/ld_script.txt index df39a16d3..65899eb9b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -864,7 +864,7 @@ SECTIONS { sound/songs/se_w114.o(.rodata); sound/songs/se_w063b.o(.rodata); sound/songs/se_rg_w_door.o(.rodata); - sound/songs/se_rg_card1.o(.rodata); + sound/songs/midi/se_rg_card1.o(.rodata); sound/songs/se_rg_card2.o(.rodata); sound/songs/se_rg_card3.o(.rodata); sound/songs/midi/se_rg_bag1.o(.rodata); @@ -1014,5 +1014,8 @@ $(MID_SUBDIR)/se_rg_bag1.s: %.s: %.mid $(MID_SUBDIR)/se_rg_bag2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 +$(MID_SUBDIR)/se_rg_card1.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_card1.mid b/sound/songs/midi/se_rg_card1.mid Binary files differnew file mode 100644 index 000000000..22a50e6df --- /dev/null +++ b/sound/songs/midi/se_rg_card1.mid diff --git a/sound/songs/se_rg_card1.s b/sound/songs/se_rg_card1.s deleted file mode 100644 index 1f2d72c3e..000000000 --- a/sound/songs/se_rg_card1.s +++ /dev/null @@ -1,48 +0,0 @@ - .include "MPlayDef.s" - - .equ se_rg_card1_grp, voicegroup129 - .equ se_rg_card1_pri, 5 - .equ se_rg_card1_rev, reverb_set+50 - .equ se_rg_card1_mvl, 127 - .equ se_rg_card1_key, 0 - .equ se_rg_card1_tbs, 1 - .equ se_rg_card1_exg, 0 - .equ se_rg_card1_cmp, 1 - - .section .rodata - .global se_rg_card1 - .align 2 - -@********************** Track 1 **********************@ - -se_rg_card1_1: - .byte KEYSH , se_rg_card1_key+0 - .byte TEMPO , 182*se_rg_card1_tbs/2 - .byte VOICE , 125 - .byte XCMD , xIECV , 8 - .byte xIECL , 8 - .byte PAN , c_v+0 - .byte VOL , 127*se_rg_card1_mvl/mxv - .byte BEND , c_v+2 - .byte N01 , Cn4 , v127 - .byte W03 - .byte VOICE , 124 - .byte N01 , Cn5 , v064 - .byte W21 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_rg_card1: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_rg_card1_pri @ Priority - .byte se_rg_card1_rev @ Reverb. - - .word se_rg_card1_grp - - .word se_rg_card1_1 - - .end |