diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:47:42 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:47:42 -0500 |
| commit | 3941ce5cf2f5ed8aa91349aead46cf511e08b849 (patch) | |
| tree | e6e629706dffc98f009a96da199586c42278df67 | |
| parent | 98831e29bb0065cc4446c4f0e2ae7266ac918cc3 (diff) | |
Match se_ru_hyuu.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/song_table.inc | 2 | ||||
| -rw-r--r-- | sound/songs/midi/se_ru_hyuu.mid | bin | 0 -> 162 bytes | |||
| -rw-r--r-- | sound/songs/se_ru_hyuu.s | 80 |
5 files changed, 5 insertions, 82 deletions
diff --git a/ld_script.txt b/ld_script.txt index 759db90d7..3ecf55dfa 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -658,7 +658,7 @@ SECTIONS { sound/songs/midi/se_ru_gashin.o(.rodata); sound/songs/midi/se_ru_gasyan.o(.rodata); sound/songs/midi/se_ru_bari.o(.rodata); - sound/songs/se_ru_hyuu.o(.rodata); + sound/songs/midi/se_ru_hyuu.o(.rodata); sound/songs/midi/se_ki_gasyan.o(.rodata); sound/songs/se_tk_warpin.o(.rodata); sound/songs/se_tk_warpout.o(.rodata); @@ -1062,5 +1062,8 @@ $(MID_SUBDIR)/se_ru_gashin.s: %.s: %.mid $(MID_SUBDIR)/se_ru_gasyan.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_ru_hyuu.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/song_table.inc b/sound/song_table.inc index 8a6a675c9..42e62b832 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -44,7 +44,7 @@ gSongTable:: @ 86B49F0 song se_ru_gashin, 1, 1 @ Sootopolis Gym - Stairs Appear song se_ru_gasyan, 1, 1 @ Sootopolis Gym - Ice Breaking song se_ru_bari, 1, 1 @ Sootopolis Gym - Walking on Ice - song se_ru_hyuu, 1, 1 @ Falling Down + song se_ru_hyuu, 1, 1 @ Falling Down a Hole song se_ki_gasyan, 2, 2 song se_tk_warpin, 1, 1 @ Warp In song se_tk_warpout, 1, 1 @ Warp Out diff --git a/sound/songs/midi/se_ru_hyuu.mid b/sound/songs/midi/se_ru_hyuu.mid Binary files differnew file mode 100644 index 000000000..1adfc9268 --- /dev/null +++ b/sound/songs/midi/se_ru_hyuu.mid diff --git a/sound/songs/se_ru_hyuu.s b/sound/songs/se_ru_hyuu.s deleted file mode 100644 index cf495141c..000000000 --- a/sound/songs/se_ru_hyuu.s +++ /dev/null @@ -1,80 +0,0 @@ - .include "MPlayDef.s" - - .equ se_ru_hyuu_grp, voicegroup128 - .equ se_ru_hyuu_pri, 4 - .equ se_ru_hyuu_rev, reverb_set+50 - .equ se_ru_hyuu_mvl, 127 - .equ se_ru_hyuu_key, 0 - .equ se_ru_hyuu_tbs, 1 - .equ se_ru_hyuu_exg, 0 - .equ se_ru_hyuu_cmp, 1 - - .section .rodata - .global se_ru_hyuu - .align 2 - -@********************** Track 1 **********************@ - -se_ru_hyuu_1: - .byte KEYSH , se_ru_hyuu_key+0 - .byte TEMPO , 170*se_ru_hyuu_tbs/2 - .byte VOICE , 22 - .byte VOL , 110*se_ru_hyuu_mvl/mxv - .byte BEND , c_v+60 - .byte N44 , Gn3 , v080 - .byte W03 - .byte BEND , c_v+57 - .byte W03 - .byte c_v+52 - .byte W03 - .byte c_v+43 - .byte W03 - .byte c_v+36 - .byte W03 - .byte c_v+30 - .byte W03 - .byte c_v+22 - .byte W03 - .byte c_v+16 - .byte W03 - .byte VOL , 104*se_ru_hyuu_mvl/mxv - .byte BEND , c_v+11 - .byte W03 - .byte VOL , 90*se_ru_hyuu_mvl/mxv - .byte BEND , c_v+3 - .byte W03 - .byte VOL , 82*se_ru_hyuu_mvl/mxv - .byte BEND , c_v-8 - .byte W03 - .byte VOL , 71*se_ru_hyuu_mvl/mxv - .byte BEND , c_v-16 - .byte W03 - .byte VOL , 58*se_ru_hyuu_mvl/mxv - .byte BEND , c_v-24 - .byte W03 - .byte VOL , 45*se_ru_hyuu_mvl/mxv - .byte BEND , c_v-36 - .byte W03 - .byte VOL , 36*se_ru_hyuu_mvl/mxv - .byte BEND , c_v-50 - .byte W03 - .byte VOL , 11*se_ru_hyuu_mvl/mxv - .byte BEND , c_v-63 - .byte W03 - .byte VOL , 3*se_ru_hyuu_mvl/mxv - .byte FINE - -@******************************************************@ - .align 2 - -se_ru_hyuu: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_ru_hyuu_pri @ Priority - .byte se_ru_hyuu_rev @ Reverb. - - .word se_ru_hyuu_grp - - .word se_ru_hyuu_1 - - .end |