diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 15:24:27 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 15:24:27 -0400 |
| commit | 615ad808bf001d2737112e7467f0a1a260e51ba3 (patch) | |
| tree | 126701cbf95fc5af9efb9b84e2d8df342623d6db | |
| parent | b985d45ddbcbeb92b1a3f660bf1a0f6ba4b82291 (diff) | |
Match se_doku.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_doku.mid | bin | 0 -> 107 bytes | |||
| -rw-r--r-- | sound/songs/se_doku.s | 50 |
5 files changed, 5 insertions, 52 deletions
diff --git a/ld_script.txt b/ld_script.txt index a4aff88c7..3463c9fd9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -643,7 +643,7 @@ SECTIONS { sound/songs/se_fuusen3.o(.rodata); sound/songs/se_toy_kabe.o(.rodata); sound/songs/se_toy_dango.o(.rodata); - sound/songs/se_doku.o(.rodata); + sound/songs/midi/se_doku.o(.rodata); sound/songs/se_esuka.o(.rodata); sound/songs/se_t_ame.o(.rodata); sound/songs/se_t_ame_e.o(.rodata); @@ -846,5 +846,8 @@ $(MID_SUBDIR)/se_daugi.s: %.s: %.mid $(MID_SUBDIR)/se_dendou.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P5 +$(MID_SUBDIR)/se_doku.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 + $(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 0cced3b1f..d599ffa45 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -80,7 +80,7 @@ gSongTable:: @ 86B49F0 song se_fuusen3, 2, 2 @ Yellow Balloon song se_toy_kabe, 2, 2 @ Breakable Door song se_toy_dango, 2, 2 @ Mud Ball - song se_doku, 1, 1 @ Overworld Poison Damage + song se_doku, 1, 1 @ Overworld - Poison Damage song se_esuka, 1, 1 @ Escalator song se_t_ame, 3, 3 @ Rain song se_t_ame_e, 3, 3 @ Rain Stop diff --git a/sound/songs/midi/se_doku.mid b/sound/songs/midi/se_doku.mid Binary files differnew file mode 100644 index 000000000..83841203a --- /dev/null +++ b/sound/songs/midi/se_doku.mid diff --git a/sound/songs/se_doku.s b/sound/songs/se_doku.s deleted file mode 100644 index 90b84b2fb..000000000 --- a/sound/songs/se_doku.s +++ /dev/null @@ -1,50 +0,0 @@ - .include "MPlayDef.s" - - .equ se_doku_grp, voicegroup127 - .equ se_doku_pri, 5 - .equ se_doku_rev, reverb_set+50 - .equ se_doku_mvl, 127 - .equ se_doku_key, 0 - .equ se_doku_tbs, 1 - .equ se_doku_exg, 0 - .equ se_doku_cmp, 1 - - .section .rodata - .global se_doku - .align 2 - -@********************** Track 1 **********************@ - -se_doku_1: - .byte KEYSH , se_doku_key+0 - .byte TEMPO , 150*se_doku_tbs/2 - .byte VOICE , 16 - .byte BENDR , 12 - .byte VOL , 110*se_doku_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Ds3 , v100 - .byte W04 - .byte N02 - .byte W05 - .byte N02 - .byte W05 - .byte N02 - .byte W05 - .byte N02 - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_doku: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_doku_pri @ Priority - .byte se_doku_rev @ Reverb. - - .word se_doku_grp - - .word se_doku_1 - - .end |