From 84f43a8369aed970289eb8b83079242cede53e9b Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 20 Nov 2018 16:39:26 -0500 Subject: [PATCH] Math se_pc_off.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/song_table.inc | 2 +- sound/songs/midi/se_pc_off.mid | Bin 0 -> 96 bytes sound/songs/se_pc_off.s | 48 --------------------------------- 5 files changed, 5 insertions(+), 50 deletions(-) create mode 100644 sound/songs/midi/se_pc_off.mid delete mode 100644 sound/songs/se_pc_off.s 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); diff --git a/songs.mk b/songs.mk index 4ff4de9b5..d7e1c10a3 100644 --- a/songs.mk +++ b/songs.mk @@ -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 new file mode 100644 index 0000000000000000000000000000000000000000..acb0960ff01f71319649a8a8de547efb78e976f2 GIT binary patch literal 96 zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPf_+{10SiU#P(FU!MUgrO$AHjbQ_O kJ;MVA3x)|c1uP9V3=9(tfV2USRsqr~AX)-MGXb>$0KH@s`Tzg` literal 0 HcmV?d00001 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