diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 15:07:05 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 15:07:05 -0500 |
| commit | 3cfee40c8282556b9fa11ad8d85dd9f954e1d04c (patch) | |
| tree | fb8d3f9df75495826fcf29fabbbe49a6b9c2bb7f | |
| parent | 68cb780ac33a01b909fd6edf098f7bbb9beeb0f1 (diff) | |
Match se_mu_pachi.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_mu_pachi.mid | bin | 0 -> 87 bytes | |||
| -rw-r--r-- | sound/songs/se_mu_pachi.s | 47 |
5 files changed, 5 insertions, 49 deletions
diff --git a/ld_script.txt b/ld_script.txt index 7209dd0e0..05fe9d5ab 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -650,7 +650,7 @@ SECTIONS { sound/songs/midi/se_hazure.o(.rodata); sound/songs/midi/se_exp.o(.rodata); sound/songs/midi/se_jite_pyoko.o(.rodata); - sound/songs/se_mu_pachi.o(.rodata); + sound/songs/midi/se_mu_pachi.o(.rodata); sound/songs/se_tk_kasya.o(.rodata); sound/songs/midi/se_fu_zaku.o(.rodata); sound/songs/midi/se_fu_zaku2.o(.rodata); @@ -957,5 +957,8 @@ $(MID_SUBDIR)/se_mizu.s: %.s: %.mid $(MID_SUBDIR)/se_moter.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V90 -P4 +$(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -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 5b5813ab2..69e1134af 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -36,7 +36,7 @@ gSongTable:: @ 86B49F0 song se_hazure, 1, 1 @ Failure song se_exp, 1, 1 @ Exp. Bar song se_jite_pyoko, 1, 1 @ Bunny Hop - song se_mu_pachi, 1, 1 + song se_mu_pachi, 1, 1 @ Toggle Switch song se_tk_kasya, 1, 1 @ Mossdeep Gym/Trick House Switch song se_fu_zaku, 1, 1 song se_fu_zaku2, 1, 1 diff --git a/sound/songs/midi/se_mu_pachi.mid b/sound/songs/midi/se_mu_pachi.mid Binary files differnew file mode 100644 index 000000000..3d909dadb --- /dev/null +++ b/sound/songs/midi/se_mu_pachi.mid diff --git a/sound/songs/se_mu_pachi.s b/sound/songs/se_mu_pachi.s deleted file mode 100644 index dbea6603a..000000000 --- a/sound/songs/se_mu_pachi.s +++ /dev/null @@ -1,47 +0,0 @@ - .include "MPlayDef.s" - - .equ se_mu_pachi_grp, voicegroup127 - .equ se_mu_pachi_pri, 4 - .equ se_mu_pachi_rev, reverb_set+50 - .equ se_mu_pachi_mvl, 127 - .equ se_mu_pachi_key, 0 - .equ se_mu_pachi_tbs, 1 - .equ se_mu_pachi_exg, 0 - .equ se_mu_pachi_cmp, 1 - - .section .rodata - .global se_mu_pachi - .align 2 - -@********************** Track 1 **********************@ - -se_mu_pachi_1: - .byte KEYSH , se_mu_pachi_key+0 - .byte TEMPO , 150*se_mu_pachi_tbs/2 - .byte VOICE , 122 - .byte VOL , 100*se_mu_pachi_mvl/mxv - .byte N01 , Ds3 , v127 - .byte W02 - .byte VOICE , 126 - .byte N01 , Gs4 - .byte W01 - .byte W03 - .byte W01 - .byte Gs4 , v088 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_mu_pachi: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_mu_pachi_pri @ Priority - .byte se_mu_pachi_rev @ Reverb. - - .word se_mu_pachi_grp - - .word se_mu_pachi_1 - - .end |