diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 16:39:26 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 16:39:26 -0500 |
| commit | 84f43a8369aed970289eb8b83079242cede53e9b (patch) | |
| tree | b43e1576c466b51f7d5f3d913bf9f62ac1578c77 | |
| parent | b15cb16bfd445e288defe60ce266aeb783b5bd42 (diff) | |
Math se_pc_off.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_pc_off.mid | bin | 0 -> 96 bytes | |||
| -rw-r--r-- | sound/songs/se_pc_off.s | 48 |
5 files changed, 5 insertions, 50 deletions
diff --git a/ld_script.txt b/ld_script.txt index 612818861..7d0944fe5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -618,7 +618,7 @@ SECTIONS { sound/songs/midi/mus_dummy.o(.rodata); sound/songs/midi/se_kaifuku.o(.rodata); sound/songs/midi/se_pc_login.o(.rodata); - sound/songs/se_pc_off.o(.rodata); + sound/songs/midi/se_pc_off.o(.rodata); sound/songs/se_pc_on.o(.rodata); sound/songs/se_select.o(.rodata); sound/songs/se_win_open.o(.rodata); @@ -981,5 +981,8 @@ $(MID_SUBDIR)/se_op_basyu.s: %.s: %.mid $(MID_SUBDIR)/se_pc_login.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 +$(MID_SUBDIR)/se_pc_off.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -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 29cb30b73..57f30657c 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -3,7 +3,7 @@ gSongTable:: @ 86B49F0 song mus_dummy, 0, 0 song se_kaifuku, 1, 1 @ Healing Item - song se_pc_login, 1, 1 @ PC Logon + song se_pc_login, 1, 1 @ PC Login song se_pc_off, 1, 1 @ PC Shutdown song se_pc_on, 1, 1 @ PC Startup song se_select, 2, 2 @ Cursor Selection diff --git a/sound/songs/midi/se_pc_off.mid b/sound/songs/midi/se_pc_off.mid Binary files differnew file mode 100644 index 000000000..acb0960ff --- /dev/null +++ b/sound/songs/midi/se_pc_off.mid diff --git a/sound/songs/se_pc_off.s b/sound/songs/se_pc_off.s deleted file mode 100644 index 1d372f92f..000000000 --- a/sound/songs/se_pc_off.s +++ /dev/null @@ -1,48 +0,0 @@ - .include "MPlayDef.s" - - .equ se_pc_off_grp, voicegroup127 - .equ se_pc_off_pri, 5 - .equ se_pc_off_rev, reverb_set+50 - .equ se_pc_off_mvl, 127 - .equ se_pc_off_key, 0 - .equ se_pc_off_tbs, 1 - .equ se_pc_off_exg, 0 - .equ se_pc_off_cmp, 1 - - .section .rodata - .global se_pc_off - .align 2 - -@********************** Track 1 **********************@ - -se_pc_off_1: - .byte KEYSH , se_pc_off_key+0 - .byte TEMPO , 120*se_pc_off_tbs/2 - .byte VOICE , 6 - .byte VOL , 100*se_pc_off_mvl/mxv - .byte BEND , c_v-8 - .byte N04 , Cn3 , v112 - .byte W04 - .byte Cn2 - .byte W02 - .byte W02 - .byte Cn1 - .byte W04 - .byte Cn1 , v024 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_pc_off: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_pc_off_pri @ Priority - .byte se_pc_off_rev @ Reverb. - - .word se_pc_off_grp - - .word se_pc_off_1 - - .end |