diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:02:01 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:02:01 -0500 |
| commit | 6b6e1882e4ceacd3b99eaefd19bbf5f96312f6c1 (patch) | |
| tree | 4cb2e1ccd98a3ba262a8238b7b8ff73bc221562e | |
| parent | 3f7e0884713997b9c548d7cc940b4e615057921c (diff) | |
Match se_rg_bag1.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_rg_bag1.mid | bin | 0 -> 115 bytes | |||
| -rw-r--r-- | sound/songs/se_rg_bag1.s | 60 |
4 files changed, 4 insertions, 61 deletions
diff --git a/ld_script.txt b/ld_script.txt index d5c4eafab..45a2c2368 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -867,7 +867,7 @@ SECTIONS { sound/songs/se_rg_card1.o(.rodata); sound/songs/se_rg_card2.o(.rodata); sound/songs/se_rg_card3.o(.rodata); - sound/songs/se_rg_bag1.o(.rodata); + sound/songs/midi/se_rg_bag1.o(.rodata); sound/songs/se_rg_bag2.o(.rodata); sound/songs/se_rg_getting.o(.rodata); sound/songs/se_rg_shop.o(.rodata); @@ -1008,5 +1008,8 @@ $(MID_SUBDIR)/se_reapoke.s: %.s: %.mid $(MID_SUBDIR)/se_regi.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 +$(MID_SUBDIR)/se_rg_bag1.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_bag1.mid b/sound/songs/midi/se_rg_bag1.mid Binary files differnew file mode 100644 index 000000000..ac783bd38 --- /dev/null +++ b/sound/songs/midi/se_rg_bag1.mid diff --git a/sound/songs/se_rg_bag1.s b/sound/songs/se_rg_bag1.s deleted file mode 100644 index d2dd38ed5..000000000 --- a/sound/songs/se_rg_bag1.s +++ /dev/null @@ -1,60 +0,0 @@ - .include "MPlayDef.s" - - .equ se_rg_bag1_grp, voicegroup129 - .equ se_rg_bag1_pri, 5 - .equ se_rg_bag1_rev, reverb_set+50 - .equ se_rg_bag1_mvl, 127 - .equ se_rg_bag1_key, 0 - .equ se_rg_bag1_tbs, 1 - .equ se_rg_bag1_exg, 0 - .equ se_rg_bag1_cmp, 1 - - .section .rodata - .global se_rg_bag1 - .align 2 - -@********************** Track 1 **********************@ - -se_rg_bag1_1: - .byte KEYSH , se_rg_bag1_key+0 - .byte TEMPO , 310*se_rg_bag1_tbs/2 - .byte VOICE , 10 - .byte XCMD , xIECV , 8 - .byte xIECL , 8 - .byte VOL , 127*se_rg_bag1_mvl/mxv - .byte BEND , c_v+2 - .byte N01 , Cs4 , v072 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_rg_bag1_2: - .byte VOL , 127*se_rg_bag1_mvl/mxv - .byte KEYSH , se_rg_bag1_key+0 - .byte VOICE , 124 - .byte N01 , Cs5 , v072 - .byte W01 - .byte Ds5 , v104 - .byte W02 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_rg_bag1: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_rg_bag1_pri @ Priority - .byte se_rg_bag1_rev @ Reverb. - - .word se_rg_bag1_grp - - .word se_rg_bag1_1 - .word se_rg_bag1_2 - - .end |