diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:37:10 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:37:10 -0500 |
| commit | a5ddb0b4b8f098aaa29995f31e24845b2bce7647 (patch) | |
| tree | 52a00177f819badeb16915d9db3d4a698ec815a4 | |
| parent | 5e9076990e2089982bcbdc9fadfc91b84d187d45 (diff) | |
Match se_rg_shop.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_rg_shop.mid | bin | 0 -> 75 bytes | |||
| -rw-r--r-- | sound/songs/se_rg_shop.s | 46 |
4 files changed, 4 insertions, 47 deletions
diff --git a/ld_script.txt b/ld_script.txt index 46cb47800..a12e90a7b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -870,7 +870,7 @@ SECTIONS { sound/songs/midi/se_rg_bag1.o(.rodata); sound/songs/midi/se_rg_bag2.o(.rodata); sound/songs/midi/se_rg_getting.o(.rodata); - sound/songs/se_rg_shop.o(.rodata); + sound/songs/midi/se_rg_shop.o(.rodata); sound/songs/midi/se_rg_kiteki.o(.rodata); sound/songs/midi/se_rg_help_op.o(.rodata); sound/songs/midi/se_rg_help_cl.o(.rodata); @@ -1047,5 +1047,8 @@ $(MID_SUBDIR)/se_rg_kiteki.s: %.s: %.mid $(MID_SUBDIR)/se_rg_nawamiss.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 +$(MID_SUBDIR)/se_rg_shop.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_rg_shop.mid b/sound/songs/midi/se_rg_shop.mid Binary files differnew file mode 100644 index 000000000..81ade1a63 --- /dev/null +++ b/sound/songs/midi/se_rg_shop.mid diff --git a/sound/songs/se_rg_shop.s b/sound/songs/se_rg_shop.s deleted file mode 100644 index d184e1e5d..000000000 --- a/sound/songs/se_rg_shop.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_rg_shop_grp, voicegroup129 - .equ se_rg_shop_pri, 5 - .equ se_rg_shop_rev, reverb_set+50 - .equ se_rg_shop_mvl, 127 - .equ se_rg_shop_key, 0 - .equ se_rg_shop_tbs, 1 - .equ se_rg_shop_exg, 0 - .equ se_rg_shop_cmp, 1 - - .section .rodata - .global se_rg_shop - .align 2 - -@********************** Track 1 **********************@ - -se_rg_shop_1: - .byte KEYSH , se_rg_shop_key+0 - .byte TEMPO , 124*se_rg_shop_tbs/2 - .byte VOICE , 8 - .byte VOL , 80*se_rg_shop_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N30 , Cn3 , v120 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_rg_shop: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_rg_shop_pri @ Priority - .byte se_rg_shop_rev @ Reverb. - - .word se_rg_shop_grp - - .word se_rg_shop_1 - - .end |