From 938c4a2bc699695526443e9c75112cd8b457c22a Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:24:39 -0400 Subject: Match se_a.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_a.mid | Bin 0 -> 75 bytes sound/songs/se_a.s | 45 --------------------------------------------- 4 files changed, 4 insertions(+), 46 deletions(-) create mode 100644 sound/songs/midi/se_a.mid delete mode 100644 sound/songs/se_a.s diff --git a/ld_script.txt b/ld_script.txt index 43a556034..7814be677 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -589,7 +589,7 @@ SECTIONS { sound/songs/se_boo.o(.rodata); sound/songs/se_bowa.o(.rodata); sound/songs/se_jyuni.o(.rodata); - sound/songs/se_a.o(.rodata); + sound/songs/midi/se_a.o(.rodata); sound/songs/se_i.o(.rodata); sound/songs/se_u.o(.rodata); sound/songs/se_e.o(.rodata); diff --git a/songs.mk b/songs.mk index fb0d6b504..f2f358234 100644 --- a/songs.mk +++ b/songs.mk @@ -786,5 +786,8 @@ $(MID_SUBDIR)/ph_trap_held.s: %.s: %.mid $(MID_SUBDIR)/ph_trap_solo.s: %.s: %.mid $(MID) $< $@ -E -G130 -P4 +$(MID_SUBDIR)/se_a.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_a.mid b/sound/songs/midi/se_a.mid new file mode 100644 index 000000000..e44a27926 Binary files /dev/null and b/sound/songs/midi/se_a.mid differ diff --git a/sound/songs/se_a.s b/sound/songs/se_a.s deleted file mode 100644 index 860a9aa27..000000000 --- a/sound/songs/se_a.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_a_grp, voicegroup128 - .equ se_a_pri, 4 - .equ se_a_rev, reverb_set+50 - .equ se_a_mvl, 127 - .equ se_a_key, 0 - .equ se_a_tbs, 1 - .equ se_a_exg, 0 - .equ se_a_cmp, 1 - - .section .rodata - .global se_a - .align 2 - -@********************** Track 1 **********************@ - -se_a_1: - .byte KEYSH , se_a_key+0 - .byte TEMPO , 240*se_a_tbs/2 - .byte VOICE , 122 - .byte BENDR , 12 - .byte VOL , 95*se_a_mvl/mxv - .byte BEND , c_v+0 - .byte N72 , Cn3 , v127 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_a: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_a_pri @ Priority - .byte se_a_rev @ Reverb. - - .word se_a_grp - - .word se_a_1 - - .end -- cgit v1.2.3 From 005ac398fb8381c62baf42bba598aac19dfed8e2 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:27:30 -0400 Subject: Match se_ban.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_ban.mid | Bin 0 -> 148 bytes sound/songs/se_ban.s | 70 -------------------------------------------- 4 files changed, 4 insertions(+), 71 deletions(-) create mode 100644 sound/songs/midi/se_ban.mid delete mode 100644 sound/songs/se_ban.s diff --git a/ld_script.txt b/ld_script.txt index 7814be677..5bbb215a1 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -584,7 +584,7 @@ SECTIONS { sound/songs/se_nigeru.o(.rodata); sound/songs/se_jido_doa.o(.rodata); sound/songs/se_naminori.o(.rodata); - sound/songs/se_ban.o(.rodata); + sound/songs/midi/se_ban.o(.rodata); sound/songs/se_pin.o(.rodata); sound/songs/se_boo.o(.rodata); sound/songs/se_bowa.o(.rodata); diff --git a/songs.mk b/songs.mk index f2f358234..aa41d5c67 100644 --- a/songs.mk +++ b/songs.mk @@ -789,5 +789,8 @@ $(MID_SUBDIR)/ph_trap_solo.s: %.s: %.mid $(MID_SUBDIR)/se_a.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 +$(MID_SUBDIR)/se_ban.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/songs/midi/se_ban.mid b/sound/songs/midi/se_ban.mid new file mode 100644 index 000000000..0722a1c36 Binary files /dev/null and b/sound/songs/midi/se_ban.mid differ diff --git a/sound/songs/se_ban.s b/sound/songs/se_ban.s deleted file mode 100644 index c4e39b5cd..000000000 --- a/sound/songs/se_ban.s +++ /dev/null @@ -1,70 +0,0 @@ - .include "MPlayDef.s" - - .equ se_ban_grp, voicegroup128 - .equ se_ban_pri, 4 - .equ se_ban_rev, reverb_set+50 - .equ se_ban_mvl, 127 - .equ se_ban_key, 0 - .equ se_ban_tbs, 1 - .equ se_ban_exg, 0 - .equ se_ban_cmp, 1 - - .section .rodata - .global se_ban - .align 2 - -@********************** Track 1 **********************@ - -se_ban_1: - .byte KEYSH , se_ban_key+0 - .byte TEMPO , 240*se_ban_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 110*se_ban_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , En2 , v127 - .byte W03 - .byte Dn2 - .byte W03 - .byte N06 , Gn1 - .byte W06 - .byte N60 , An2 - .byte W12 - .byte W24 - .byte VOL , 94*se_ban_mvl/mxv - .byte BEND , c_v-5 - .byte W03 - .byte VOL , 81*se_ban_mvl/mxv - .byte W03 - .byte 71*se_ban_mvl/mxv - .byte BEND , c_v-12 - .byte W03 - .byte VOL , 47*se_ban_mvl/mxv - .byte W03 - .byte 32*se_ban_mvl/mxv - .byte BEND , c_v-19 - .byte W03 - .byte VOL , 20*se_ban_mvl/mxv - .byte W03 - .byte 7*se_ban_mvl/mxv - .byte BEND , c_v-28 - .byte W03 - .byte VOL , 0*se_ban_mvl/mxv - .byte BEND , c_v-37 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_ban: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_ban_pri @ Priority - .byte se_ban_rev @ Reverb. - - .word se_ban_grp - - .word se_ban_1 - - .end -- cgit v1.2.3 From 66c1e8008cbdc653f0769336f13ffdad5cf45087 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:31:18 -0400 Subject: Match se_basabasa.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/se_basabasa.mid | Bin 0 -> 266 bytes sound/songs/se_basabasa.s | 123 --------------------------------------- 5 files changed, 5 insertions(+), 125 deletions(-) create mode 100644 sound/songs/midi/se_basabasa.mid delete mode 100644 sound/songs/se_basabasa.s diff --git a/ld_script.txt b/ld_script.txt index 5bbb215a1..bc158cc09 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -658,7 +658,7 @@ SECTIONS { sound/songs/se_expmax.o(.rodata); sound/songs/se_tamakoro.o(.rodata); sound/songs/se_tamakoro_e.o(.rodata); - sound/songs/se_basabasa.o(.rodata); + sound/songs/midi/se_basabasa.o(.rodata); sound/songs/se_regi.o(.rodata); sound/songs/se_c_gaji.o(.rodata); sound/songs/se_c_maku_u.o(.rodata); diff --git a/songs.mk b/songs.mk index aa41d5c67..7fc259865 100644 --- a/songs.mk +++ b/songs.mk @@ -792,5 +792,8 @@ $(MID_SUBDIR)/se_a.s: %.s: %.mid $(MID_SUBDIR)/se_ban.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_basabasa.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -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 624cabe53..9c4aa1b63 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -95,7 +95,7 @@ gSongTable:: @ 86B49F0 song se_expmax, 1, 1 @ Exp. Max song se_tamakoro, 2, 2 @ Roulette Ball song se_tamakoro_e, 2, 2 @ Roulette Ball 2 - song se_basabasa, 1, 1 + song se_basabasa, 1, 1 @ Wing Attack song se_regi, 1, 1 @ Cash Register song se_c_gaji, 1, 1 @ Contest Hearts song se_c_maku_u, 1, 1 @ Contest Curtain rise diff --git a/sound/songs/midi/se_basabasa.mid b/sound/songs/midi/se_basabasa.mid new file mode 100644 index 000000000..7a965abf5 Binary files /dev/null and b/sound/songs/midi/se_basabasa.mid differ diff --git a/sound/songs/se_basabasa.s b/sound/songs/se_basabasa.s deleted file mode 100644 index bf1ee14ca..000000000 --- a/sound/songs/se_basabasa.s +++ /dev/null @@ -1,123 +0,0 @@ - .include "MPlayDef.s" - - .equ se_basabasa_grp, voicegroup128 - .equ se_basabasa_pri, 5 - .equ se_basabasa_rev, reverb_set+50 - .equ se_basabasa_mvl, 127 - .equ se_basabasa_key, 0 - .equ se_basabasa_tbs, 1 - .equ se_basabasa_exg, 0 - .equ se_basabasa_cmp, 1 - - .section .rodata - .global se_basabasa - .align 2 - -@********************** Track 1 **********************@ - -se_basabasa_1: - .byte KEYSH , se_basabasa_key+0 -se_basabasa_1_B1: - .byte TEMPO , 220*se_basabasa_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 40*se_basabasa_mvl/mxv - .byte BEND , c_v-32 - .byte N07 , An1 , v127 - .byte W01 - .byte VOL , 52*se_basabasa_mvl/mxv - .byte PAN , c_v+10 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 68*se_basabasa_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 82*se_basabasa_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+17 - .byte W01 - .byte VOL , 105*se_basabasa_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+37 - .byte W02 - .byte PAN , c_v+10 - .byte BEND , c_v+63 - .byte W03 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 40*se_basabasa_mvl/mxv - .byte PAN , c_v+10 - .byte BEND , c_v+1 - .byte N06 - .byte W02 - .byte VOL , 52*se_basabasa_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+38 - .byte W01 - .byte VOL , 79*se_basabasa_mvl/mxv - .byte PAN , c_v-9 - .byte BEND , c_v+48 - .byte W01 - .byte VOL , 105*se_basabasa_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+63 - .byte W10 - .byte W12 - .byte W12 - .byte GOTO - .word se_basabasa_1_B1 - .byte FINE - -@********************** Track 2 **********************@ - -se_basabasa_2: - .byte KEYSH , se_basabasa_key+0 -se_basabasa_2_B1: - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 52*se_basabasa_mvl/mxv - .byte N07 , Gn2 , v040 - .byte W01 - .byte VOL , 69*se_basabasa_mvl/mxv - .byte W01 - .byte 83*se_basabasa_mvl/mxv - .byte W01 - .byte 105*se_basabasa_mvl/mxv - .byte W01 - .byte 67*se_basabasa_mvl/mxv - .byte W02 - .byte 23*se_basabasa_mvl/mxv - .byte W04 - .byte VOICE , 25 - .byte VOL , 52*se_basabasa_mvl/mxv - .byte N06 , Gs4 - .byte W02 - .byte VOL , 81*se_basabasa_mvl/mxv - .byte W01 - .byte 105*se_basabasa_mvl/mxv - .byte W02 - .byte 52*se_basabasa_mvl/mxv - .byte W09 - .byte W12 - .byte W12 - .byte GOTO - .word se_basabasa_2_B1 - .byte FINE - -@******************************************************@ - .align 2 - -se_basabasa: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_basabasa_pri @ Priority - .byte se_basabasa_rev @ Reverb. - - .word se_basabasa_grp - - .word se_basabasa_1 - .word se_basabasa_2 - - .end -- cgit v1.2.3 From 44d003140b0ce0133b5858a59aaa82779caaaa64 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:34:21 -0400 Subject: Match se_bidoro.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_bidoro.mid | Bin 0 -> 135 bytes sound/songs/se_bidoro.s | 61 ----------------------------------------- 4 files changed, 4 insertions(+), 62 deletions(-) create mode 100644 sound/songs/midi/se_bidoro.mid delete mode 100644 sound/songs/se_bidoro.s diff --git a/ld_script.txt b/ld_script.txt index bc158cc09..c2b66abc8 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -681,7 +681,7 @@ SECTIONS { sound/songs/se_tb_start.o(.rodata); sound/songs/se_tb_kon.o(.rodata); sound/songs/se_tb_kara.o(.rodata); - sound/songs/se_bidoro.o(.rodata); + sound/songs/midi/se_bidoro.o(.rodata); sound/songs/se_w085.o(.rodata); sound/songs/se_w085b.o(.rodata); sound/songs/se_w231.o(.rodata); diff --git a/songs.mk b/songs.mk index 7fc259865..7ec2151a3 100644 --- a/songs.mk +++ b/songs.mk @@ -795,5 +795,8 @@ $(MID_SUBDIR)/se_ban.s: %.s: %.mid $(MID_SUBDIR)/se_basabasa.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5 +$(MID_SUBDIR)/se_bidoro.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_bidoro.mid b/sound/songs/midi/se_bidoro.mid new file mode 100644 index 000000000..a0b639ba4 Binary files /dev/null and b/sound/songs/midi/se_bidoro.mid differ diff --git a/sound/songs/se_bidoro.s b/sound/songs/se_bidoro.s deleted file mode 100644 index 6130a39a2..000000000 --- a/sound/songs/se_bidoro.s +++ /dev/null @@ -1,61 +0,0 @@ - .include "MPlayDef.s" - - .equ se_bidoro_grp, voicegroup128 - .equ se_bidoro_pri, 5 - .equ se_bidoro_rev, reverb_set+50 - .equ se_bidoro_mvl, 127 - .equ se_bidoro_key, 0 - .equ se_bidoro_tbs, 1 - .equ se_bidoro_exg, 0 - .equ se_bidoro_cmp, 1 - - .section .rodata - .global se_bidoro - .align 2 - -@********************** Track 1 **********************@ - -se_bidoro_1: - .byte KEYSH , se_bidoro_key+0 - .byte TEMPO , 120*se_bidoro_tbs/2 - .byte VOICE , 28 - .byte VOL , 26*se_bidoro_mvl/mxv - .byte BENDR , 8 - .byte BEND , c_v+0 - .byte N01 , En3 , v116 - .byte W01 - .byte VOL , 105*se_bidoro_mvl/mxv - .byte BEND , c_v-4 - .byte N01 , Bn2 - .byte W01 - .byte BEND , c_v+3 - .byte N01 , Cn3 - .byte W04 - .byte W04 - .byte BEND , c_v+0 - .byte N04 , Bn3 - .byte W02 - .byte VOL , 26*se_bidoro_mvl/mxv - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 105*se_bidoro_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte c_v-23 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_bidoro: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_bidoro_pri @ Priority - .byte se_bidoro_rev @ Reverb. - - .word se_bidoro_grp - - .word se_bidoro_1 - - .end -- cgit v1.2.3 From 50393acc65306d86d907787fa1ad11f69e2d288c Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:36:44 -0400 Subject: Match se_boo.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_boo.mid | Bin 0 -> 91 bytes sound/songs/se_boo.s | 47 -------------------------------------------- 4 files changed, 4 insertions(+), 48 deletions(-) create mode 100644 sound/songs/midi/se_boo.mid delete mode 100644 sound/songs/se_boo.s diff --git a/ld_script.txt b/ld_script.txt index c2b66abc8..fb33456bd 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -586,7 +586,7 @@ SECTIONS { sound/songs/se_naminori.o(.rodata); sound/songs/midi/se_ban.o(.rodata); sound/songs/se_pin.o(.rodata); - sound/songs/se_boo.o(.rodata); + sound/songs/midi/se_boo.o(.rodata); sound/songs/se_bowa.o(.rodata); sound/songs/se_jyuni.o(.rodata); sound/songs/midi/se_a.o(.rodata); diff --git a/songs.mk b/songs.mk index 7ec2151a3..ed3a58496 100644 --- a/songs.mk +++ b/songs.mk @@ -798,5 +798,8 @@ $(MID_SUBDIR)/se_basabasa.s: %.s: %.mid $(MID_SUBDIR)/se_bidoro.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5 +$(MID_SUBDIR)/se_boo.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_boo.mid b/sound/songs/midi/se_boo.mid new file mode 100644 index 000000000..89eb130b9 Binary files /dev/null and b/sound/songs/midi/se_boo.mid differ diff --git a/sound/songs/se_boo.s b/sound/songs/se_boo.s deleted file mode 100644 index c6bb1cb06..000000000 --- a/sound/songs/se_boo.s +++ /dev/null @@ -1,47 +0,0 @@ - .include "MPlayDef.s" - - .equ se_boo_grp, voicegroup127 - .equ se_boo_pri, 4 - .equ se_boo_rev, reverb_set+50 - .equ se_boo_mvl, 127 - .equ se_boo_key, 0 - .equ se_boo_tbs, 1 - .equ se_boo_exg, 0 - .equ se_boo_cmp, 1 - - .section .rodata - .global se_boo - .align 2 - -@********************** Track 1 **********************@ - -se_boo_1: - .byte KEYSH , se_boo_key+0 - .byte TEMPO , 100*se_boo_tbs/2 - .byte VOICE , 5 - .byte BENDR , 12 - .byte VOL , 110*se_boo_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Cn3 , v127 - .byte W03 - .byte Cn2 , v112 - .byte W03 - .byte W03 - .byte Cn2 , v024 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_boo: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_boo_pri @ Priority - .byte se_boo_rev @ Reverb. - - .word se_boo_grp - - .word se_boo_1 - - .end -- cgit v1.2.3 From ecf9d206e2738dd2cb4c530263b3367a75f007f3 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:38:28 -0400 Subject: Match se_bowa.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_bowa.mid | Bin 0 -> 86 bytes sound/songs/se_bowa.s | 45 ------------------------------------------- 4 files changed, 4 insertions(+), 46 deletions(-) create mode 100644 sound/songs/midi/se_bowa.mid delete mode 100644 sound/songs/se_bowa.s diff --git a/ld_script.txt b/ld_script.txt index fb33456bd..f1aa96fc2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -587,7 +587,7 @@ SECTIONS { sound/songs/midi/se_ban.o(.rodata); sound/songs/se_pin.o(.rodata); sound/songs/midi/se_boo.o(.rodata); - sound/songs/se_bowa.o(.rodata); + sound/songs/midi/se_bowa.o(.rodata); sound/songs/se_jyuni.o(.rodata); sound/songs/midi/se_a.o(.rodata); sound/songs/se_i.o(.rodata); diff --git a/songs.mk b/songs.mk index ed3a58496..9973061ba 100644 --- a/songs.mk +++ b/songs.mk @@ -801,5 +801,8 @@ $(MID_SUBDIR)/se_bidoro.s: %.s: %.mid $(MID_SUBDIR)/se_boo.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 +$(MID_SUBDIR)/se_bowa.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V070 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_bowa.mid b/sound/songs/midi/se_bowa.mid new file mode 100644 index 000000000..684ea618c Binary files /dev/null and b/sound/songs/midi/se_bowa.mid differ diff --git a/sound/songs/se_bowa.s b/sound/songs/se_bowa.s deleted file mode 100644 index 93b84265b..000000000 --- a/sound/songs/se_bowa.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_bowa_grp, voicegroup127 - .equ se_bowa_pri, 4 - .equ se_bowa_rev, reverb_set+50 - .equ se_bowa_mvl, 127 - .equ se_bowa_key, 0 - .equ se_bowa_tbs, 1 - .equ se_bowa_exg, 0 - .equ se_bowa_cmp, 1 - - .section .rodata - .global se_bowa - .align 2 - -@********************** Track 1 **********************@ - -se_bowa_1: - .byte KEYSH , se_bowa_key+0 - .byte TEMPO , 128*se_bowa_tbs/2 - .byte VOICE , 7 - .byte BENDR , 12 - .byte VOL , 70*se_bowa_mvl/mxv - .byte BEND , c_v+2 - .byte N04 , Fn2 , v127 - .byte W04 - .byte N01 , Dn3 - .byte W02 - .byte VOICE , 8 - .byte FINE - -@******************************************************@ - .align 2 - -se_bowa: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_bowa_pri @ Priority - .byte se_bowa_rev @ Reverb. - - .word se_bowa_grp - - .word se_bowa_1 - - .end -- cgit v1.2.3 From 33872e8899962c1ed81dcff64328795ace0014a2 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:40:41 -0400 Subject: Match se_bowa2.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_bowa2.mid | Bin 0 -> 181 bytes sound/songs/se_bowa2.s | 83 ------------------------------------------ 4 files changed, 4 insertions(+), 84 deletions(-) create mode 100644 sound/songs/midi/se_bowa2.mid delete mode 100644 sound/songs/se_bowa2.s diff --git a/ld_script.txt b/ld_script.txt index f1aa96fc2..8fd9ff839 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -579,7 +579,7 @@ SECTIONS { sound/songs/se_kouka_l.o(.rodata); sound/songs/se_kouka_m.o(.rodata); sound/songs/se_kouka_h.o(.rodata); - sound/songs/se_bowa2.o(.rodata); + sound/songs/midi/se_bowa2.o(.rodata); sound/songs/se_poke_dead.o(.rodata); sound/songs/se_nigeru.o(.rodata); sound/songs/se_jido_doa.o(.rodata); diff --git a/songs.mk b/songs.mk index 9973061ba..75296b882 100644 --- a/songs.mk +++ b/songs.mk @@ -804,5 +804,8 @@ $(MID_SUBDIR)/se_boo.s: %.s: %.mid $(MID_SUBDIR)/se_bowa.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V070 -P4 +$(MID_SUBDIR)/se_bowa2.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/songs/midi/se_bowa2.mid b/sound/songs/midi/se_bowa2.mid new file mode 100644 index 000000000..669bed700 Binary files /dev/null and b/sound/songs/midi/se_bowa2.mid differ diff --git a/sound/songs/se_bowa2.s b/sound/songs/se_bowa2.s deleted file mode 100644 index 571c45291..000000000 --- a/sound/songs/se_bowa2.s +++ /dev/null @@ -1,83 +0,0 @@ - .include "MPlayDef.s" - - .equ se_bowa2_grp, voicegroup127 - .equ se_bowa2_pri, 5 - .equ se_bowa2_rev, reverb_set+50 - .equ se_bowa2_mvl, 127 - .equ se_bowa2_key, 0 - .equ se_bowa2_tbs, 1 - .equ se_bowa2_exg, 0 - .equ se_bowa2_cmp, 1 - - .section .rodata - .global se_bowa2 - .align 2 - -@********************** Track 1 **********************@ - -se_bowa2_1: - .byte KEYSH , se_bowa2_key+0 - .byte TEMPO , 90*se_bowa2_tbs/2 - .byte VOICE , 86 - .byte VOL , 100*se_bowa2_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Gn1 , v100 - .byte W03 - .byte N05 , Fn2 - .byte W03 - .byte W03 - .byte N06 , Fn2 , v052 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_bowa2_2: - .byte KEYSH , se_bowa2_key+0 - .byte VOICE , 0 - .byte VOL , 100*se_bowa2_mvl/mxv - .byte BENDR , 12 - .byte BEND , c_v+0 - .byte N03 , Gn3 , v052 - .byte W03 - .byte Cn2 , v112 - .byte W03 - .byte W03 - .byte Cn1 , v092 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 3 **********************@ - -se_bowa2_3: - .byte KEYSH , se_bowa2_key+0 - .byte VOICE , 124 - .byte VOL , 100*se_bowa2_mvl/mxv - .byte N03 , Gn3 , v052 - .byte W03 - .byte N06 , Gs4 - .byte W03 - .byte W03 - .byte Gs4 , v020 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_bowa2: - .byte 3 @ NumTrks - .byte 0 @ NumBlks - .byte se_bowa2_pri @ Priority - .byte se_bowa2_rev @ Reverb. - - .word se_bowa2_grp - - .word se_bowa2_1 - .word se_bowa2_2 - .word se_bowa2_3 - - .end -- cgit v1.2.3 From 4a8dff5ebb642f4cf29790614f4588d7270240fe Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:44:13 -0400 Subject: Match se_bt_start.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/songs/midi/se_bt_start.mid | Bin 0 -> 334 bytes sound/songs/se_bt_start.s | 212 --------------------------------------- 4 files changed, 4 insertions(+), 213 deletions(-) create mode 100644 sound/songs/midi/se_bt_start.mid delete mode 100644 sound/songs/se_bt_start.s diff --git a/ld_script.txt b/ld_script.txt index 8fd9ff839..40310951e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -668,7 +668,7 @@ SECTIONS { sound/songs/se_c_pikon.o(.rodata); sound/songs/se_reapoke.o(.rodata); sound/songs/se_op_basyu.o(.rodata); - sound/songs/se_bt_start.o(.rodata); + sound/songs/midi/se_bt_start.o(.rodata); sound/songs/se_dendou.o(.rodata); sound/songs/se_jihanki.o(.rodata); sound/songs/se_tama.o(.rodata); diff --git a/songs.mk b/songs.mk index 75296b882..de0af58b0 100644 --- a/songs.mk +++ b/songs.mk @@ -807,5 +807,8 @@ $(MID_SUBDIR)/se_bowa.s: %.s: %.mid $(MID_SUBDIR)/se_bowa2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 +$(MID_SUBDIR)/se_bt_start.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_bt_start.mid b/sound/songs/midi/se_bt_start.mid new file mode 100644 index 000000000..8c13783e9 Binary files /dev/null and b/sound/songs/midi/se_bt_start.mid differ diff --git a/sound/songs/se_bt_start.s b/sound/songs/se_bt_start.s deleted file mode 100644 index c0c30550b..000000000 --- a/sound/songs/se_bt_start.s +++ /dev/null @@ -1,212 +0,0 @@ - .include "MPlayDef.s" - - .equ se_bt_start_grp, voicegroup128 - .equ se_bt_start_pri, 5 - .equ se_bt_start_rev, reverb_set+50 - .equ se_bt_start_mvl, 127 - .equ se_bt_start_key, 0 - .equ se_bt_start_tbs, 1 - .equ se_bt_start_exg, 0 - .equ se_bt_start_cmp, 1 - - .section .rodata - .global se_bt_start - .align 2 - -@********************** Track 1 **********************@ - -se_bt_start_1: - .byte KEYSH , se_bt_start_key+0 - .byte TEMPO , 110*se_bt_start_tbs/2 - .byte VOICE , 66 - .byte BENDR , 12 - .byte VOL , 90*se_bt_start_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N90 , Gs3 , v040 - .byte W06 - .byte W06 - .byte BEND , c_v+1 - .byte W04 - .byte c_v+3 - .byte W02 - .byte W04 - .byte c_v+5 - .byte W02 - .byte W04 - .byte c_v+8 - .byte W02 - .byte W03 - .byte c_v+11 - .byte W03 - .byte W03 - .byte c_v+18 - .byte W03 - .byte W02 - .byte c_v+24 - .byte W04 - .byte c_v+30 - .byte W02 - .byte c_v+38 - .byte W02 - .byte c_v+43 - .byte W02 - .byte W01 - .byte c_v+56 - .byte W02 - .byte c_v+63 - .byte W03 - .byte W03 - .byte VOL , 83*se_bt_start_mvl/mxv - .byte W03 - .byte 75*se_bt_start_mvl/mxv - .byte W04 - .byte 68*se_bt_start_mvl/mxv - .byte W02 - .byte W01 - .byte 55*se_bt_start_mvl/mxv - .byte W04 - .byte 42*se_bt_start_mvl/mxv - .byte W01 - .byte W03 - .byte 29*se_bt_start_mvl/mxv - .byte W03 - .byte 17*se_bt_start_mvl/mxv - .byte W03 - .byte 8*se_bt_start_mvl/mxv - .byte W03 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_bt_start_2: - .byte KEYSH , se_bt_start_key+0 - .byte VOICE , 2 - .byte VOL , 14*se_bt_start_mvl/mxv - .byte PAN , c_v-1 - .byte BEND , c_v+0 - .byte TIE , Gn3 , v100 - .byte W01 - .byte VOL , 19*se_bt_start_mvl/mxv - .byte W01 - .byte 30*se_bt_start_mvl/mxv - .byte W02 - .byte 37*se_bt_start_mvl/mxv - .byte W02 - .byte W02 - .byte 44*se_bt_start_mvl/mxv - .byte W04 - .byte 49*se_bt_start_mvl/mxv - .byte W04 - .byte 53*se_bt_start_mvl/mxv - .byte W02 - .byte W03 - .byte 58*se_bt_start_mvl/mxv - .byte W03 - .byte W02 - .byte 64*se_bt_start_mvl/mxv - .byte W04 - .byte 68*se_bt_start_mvl/mxv - .byte W03 - .byte 74*se_bt_start_mvl/mxv - .byte W03 - .byte W01 - .byte BEND , c_v+1 - .byte W01 - .byte VOL , 81*se_bt_start_mvl/mxv - .byte W04 - .byte BEND , c_v+2 - .byte W01 - .byte VOL , 90*se_bt_start_mvl/mxv - .byte W03 - .byte BEND , c_v+4 - .byte W02 - .byte W03 - .byte c_v+5 - .byte W03 - .byte W01 - .byte c_v+6 - .byte W03 - .byte c_v+6 - .byte W02 - .byte W02 - .byte c_v+8 - .byte W02 - .byte c_v+10 - .byte W02 - .byte W01 - .byte c_v+14 - .byte W02 - .byte c_v+17 - .byte W03 - .byte c_v+24 - .byte W02 - .byte c_v+30 - .byte W01 - .byte c_v+41 - .byte W01 - .byte c_v+46 - .byte W02 - .byte c_v+55 - .byte W01 - .byte c_v+60 - .byte W01 - .byte c_v+63 - .byte W01 - .byte VOL , 87*se_bt_start_mvl/mxv - .byte W03 - .byte 85*se_bt_start_mvl/mxv - .byte PAN , c_v-4 - .byte W02 - .byte VOL , 78*se_bt_start_mvl/mxv - .byte PAN , c_v+4 - .byte W02 - .byte VOL , 75*se_bt_start_mvl/mxv - .byte PAN , c_v-6 - .byte W02 - .byte W01 - .byte VOL , 69*se_bt_start_mvl/mxv - .byte PAN , c_v+6 - .byte W02 - .byte VOL , 59*se_bt_start_mvl/mxv - .byte PAN , c_v-20 - .byte W03 - .byte VOL , 49*se_bt_start_mvl/mxv - .byte PAN , c_v+22 - .byte W02 - .byte VOL , 41*se_bt_start_mvl/mxv - .byte PAN , c_v-37 - .byte W02 - .byte VOL , 30*se_bt_start_mvl/mxv - .byte PAN , c_v+37 - .byte W02 - .byte W01 - .byte VOL , 19*se_bt_start_mvl/mxv - .byte PAN , c_v-48 - .byte W02 - .byte VOL , 10*se_bt_start_mvl/mxv - .byte PAN , c_v+48 - .byte W01 - .byte VOL , 4*se_bt_start_mvl/mxv - .byte W02 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_bt_start: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_bt_start_pri @ Priority - .byte se_bt_start_rev @ Reverb. - - .word se_bt_start_grp - - .word se_bt_start_1 - .word se_bt_start_2 - - .end -- cgit v1.2.3 From df9e2678faf876d1d4f126ca0f8cd4d29c136c1d Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:47:02 -0400 Subject: Match se_c_gaji.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_c_gaji.mid | Bin 0 -> 80 bytes sound/songs/se_c_gaji.s | 44 ----------------------------------------- 4 files changed, 4 insertions(+), 45 deletions(-) create mode 100644 sound/songs/midi/se_c_gaji.mid delete mode 100644 sound/songs/se_c_gaji.s diff --git a/ld_script.txt b/ld_script.txt index 40310951e..132cf6746 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -660,7 +660,7 @@ SECTIONS { sound/songs/se_tamakoro_e.o(.rodata); sound/songs/midi/se_basabasa.o(.rodata); sound/songs/se_regi.o(.rodata); - sound/songs/se_c_gaji.o(.rodata); + sound/songs/midi/se_c_gaji.o(.rodata); sound/songs/se_c_maku_u.o(.rodata); sound/songs/se_c_maku_d.o(.rodata); sound/songs/se_c_pasi.o(.rodata); diff --git a/songs.mk b/songs.mk index de0af58b0..aff7937d5 100644 --- a/songs.mk +++ b/songs.mk @@ -810,5 +810,8 @@ $(MID_SUBDIR)/se_bowa2.s: %.s: %.mid $(MID_SUBDIR)/se_bt_start.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 +$(MID_SUBDIR)/se_c_gaji.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_c_gaji.mid b/sound/songs/midi/se_c_gaji.mid new file mode 100644 index 000000000..94b6389b7 Binary files /dev/null and b/sound/songs/midi/se_c_gaji.mid differ diff --git a/sound/songs/se_c_gaji.s b/sound/songs/se_c_gaji.s deleted file mode 100644 index 38217dbe5..000000000 --- a/sound/songs/se_c_gaji.s +++ /dev/null @@ -1,44 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_gaji_grp, voicegroup128 - .equ se_c_gaji_pri, 5 - .equ se_c_gaji_rev, reverb_set+50 - .equ se_c_gaji_mvl, 127 - .equ se_c_gaji_key, 0 - .equ se_c_gaji_tbs, 1 - .equ se_c_gaji_exg, 0 - .equ se_c_gaji_cmp, 1 - - .section .rodata - .global se_c_gaji - .align 2 - -@********************** Track 1 **********************@ - -se_c_gaji_1: - .byte KEYSH , se_c_gaji_key+0 - .byte TEMPO , 150*se_c_gaji_tbs/2 - .byte VOICE , 14 - .byte VOL , 90*se_c_gaji_mvl/mxv - .byte BEND , c_v-7 - .byte N02 , Cn5 , v112 - .byte W02 - .byte N09 , Gn4 - .byte W04 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_gaji: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_gaji_pri @ Priority - .byte se_c_gaji_rev @ Reverb. - - .word se_c_gaji_grp - - .word se_c_gaji_1 - - .end -- cgit v1.2.3 From f967501b735dbdf6a1e5e0beb08ebdb78793b507 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:49:10 -0400 Subject: Match se_c_maku_d.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_c_maku_d.mid | Bin 0 -> 195 bytes sound/songs/se_c_maku_d.s | 95 --------------------------------------- 4 files changed, 4 insertions(+), 96 deletions(-) create mode 100644 sound/songs/midi/se_c_maku_d.mid delete mode 100644 sound/songs/se_c_maku_d.s diff --git a/ld_script.txt b/ld_script.txt index 132cf6746..d61fd8bce 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -662,7 +662,7 @@ SECTIONS { sound/songs/se_regi.o(.rodata); sound/songs/midi/se_c_gaji.o(.rodata); sound/songs/se_c_maku_u.o(.rodata); - sound/songs/se_c_maku_d.o(.rodata); + sound/songs/midi/se_c_maku_d.o(.rodata); sound/songs/se_c_pasi.o(.rodata); sound/songs/se_c_syu.o(.rodata); sound/songs/se_c_pikon.o(.rodata); diff --git a/songs.mk b/songs.mk index aff7937d5..a058364cd 100644 --- a/songs.mk +++ b/songs.mk @@ -813,5 +813,8 @@ $(MID_SUBDIR)/se_bt_start.s: %.s: %.mid $(MID_SUBDIR)/se_c_gaji.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 +$(MID_SUBDIR)/se_c_maku_d.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_c_maku_d.mid b/sound/songs/midi/se_c_maku_d.mid new file mode 100644 index 000000000..04e2bfb11 Binary files /dev/null and b/sound/songs/midi/se_c_maku_d.mid differ diff --git a/sound/songs/se_c_maku_d.s b/sound/songs/se_c_maku_d.s deleted file mode 100644 index f97673f07..000000000 --- a/sound/songs/se_c_maku_d.s +++ /dev/null @@ -1,95 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_maku_d_grp, voicegroup128 - .equ se_c_maku_d_pri, 5 - .equ se_c_maku_d_rev, reverb_set+50 - .equ se_c_maku_d_mvl, 127 - .equ se_c_maku_d_key, 0 - .equ se_c_maku_d_tbs, 1 - .equ se_c_maku_d_exg, 0 - .equ se_c_maku_d_cmp, 1 - - .section .rodata - .global se_c_maku_d - .align 2 - -@********************** Track 1 **********************@ - -se_c_maku_d_1: - .byte KEYSH , se_c_maku_d_key+0 - .byte TEMPO , 150*se_c_maku_d_tbs/2 - .byte VOICE , 25 - .byte VOL , 12*se_c_maku_d_mvl/mxv - .byte BEND , c_v+0 - .byte N12 , Gs4 , v060 - .byte W01 - .byte VOL , 22*se_c_maku_d_mvl/mxv - .byte W01 - .byte 33*se_c_maku_d_mvl/mxv - .byte W01 - .byte 46*se_c_maku_d_mvl/mxv - .byte W01 - .byte 58*se_c_maku_d_mvl/mxv - .byte W02 - .byte 70*se_c_maku_d_mvl/mxv - .byte W02 - .byte 60*se_c_maku_d_mvl/mxv - .byte W01 - .byte 42*se_c_maku_d_mvl/mxv - .byte W01 - .byte 22*se_c_maku_d_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_c_maku_d_2: - .byte KEYSH , se_c_maku_d_key+0 - .byte VOICE , 15 - .byte VOL , 12*se_c_maku_d_mvl/mxv - .byte BEND , c_v+0 - .byte N12 , Fn3 , v100 - .byte W01 - .byte VOL , 22*se_c_maku_d_mvl/mxv - .byte BEND , c_v-4 - .byte W01 - .byte VOL , 33*se_c_maku_d_mvl/mxv - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 46*se_c_maku_d_mvl/mxv - .byte BEND , c_v-10 - .byte W01 - .byte VOL , 58*se_c_maku_d_mvl/mxv - .byte BEND , c_v-15 - .byte W02 - .byte VOL , 70*se_c_maku_d_mvl/mxv - .byte BEND , c_v-23 - .byte W01 - .byte c_v-31 - .byte W01 - .byte VOL , 60*se_c_maku_d_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte VOL , 42*se_c_maku_d_mvl/mxv - .byte BEND , c_v-48 - .byte W01 - .byte VOL , 22*se_c_maku_d_mvl/mxv - .byte BEND , c_v-55 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_maku_d: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_maku_d_pri @ Priority - .byte se_c_maku_d_rev @ Reverb. - - .word se_c_maku_d_grp - - .word se_c_maku_d_1 - .word se_c_maku_d_2 - - .end -- cgit v1.2.3 From acb7b7eb5c0dbd6337e508749d578a07f36cf389 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:50:48 -0400 Subject: Match se_c_maku_u.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_c_maku_u.mid | Bin 0 -> 195 bytes sound/songs/se_c_maku_u.s | 95 --------------------------------------- 4 files changed, 4 insertions(+), 96 deletions(-) create mode 100644 sound/songs/midi/se_c_maku_u.mid delete mode 100644 sound/songs/se_c_maku_u.s diff --git a/ld_script.txt b/ld_script.txt index d61fd8bce..f13e04072 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -661,7 +661,7 @@ SECTIONS { sound/songs/midi/se_basabasa.o(.rodata); sound/songs/se_regi.o(.rodata); sound/songs/midi/se_c_gaji.o(.rodata); - sound/songs/se_c_maku_u.o(.rodata); + sound/songs/midi/se_c_maku_u.o(.rodata); sound/songs/midi/se_c_maku_d.o(.rodata); sound/songs/se_c_pasi.o(.rodata); sound/songs/se_c_syu.o(.rodata); diff --git a/songs.mk b/songs.mk index a058364cd..9afe371b2 100644 --- a/songs.mk +++ b/songs.mk @@ -816,5 +816,8 @@ $(MID_SUBDIR)/se_c_gaji.s: %.s: %.mid $(MID_SUBDIR)/se_c_maku_d.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5 +$(MID_SUBDIR)/se_c_maku_u.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_c_maku_u.mid b/sound/songs/midi/se_c_maku_u.mid new file mode 100644 index 000000000..109f92322 Binary files /dev/null and b/sound/songs/midi/se_c_maku_u.mid differ diff --git a/sound/songs/se_c_maku_u.s b/sound/songs/se_c_maku_u.s deleted file mode 100644 index fa0ef3f0d..000000000 --- a/sound/songs/se_c_maku_u.s +++ /dev/null @@ -1,95 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_maku_u_grp, voicegroup128 - .equ se_c_maku_u_pri, 5 - .equ se_c_maku_u_rev, reverb_set+50 - .equ se_c_maku_u_mvl, 127 - .equ se_c_maku_u_key, 0 - .equ se_c_maku_u_tbs, 1 - .equ se_c_maku_u_exg, 0 - .equ se_c_maku_u_cmp, 1 - - .section .rodata - .global se_c_maku_u - .align 2 - -@********************** Track 1 **********************@ - -se_c_maku_u_1: - .byte KEYSH , se_c_maku_u_key+0 - .byte TEMPO , 150*se_c_maku_u_tbs/2 - .byte VOICE , 25 - .byte VOL , 12*se_c_maku_u_mvl/mxv - .byte BEND , c_v+0 - .byte N12 , Gs4 , v060 - .byte W01 - .byte VOL , 22*se_c_maku_u_mvl/mxv - .byte W01 - .byte 33*se_c_maku_u_mvl/mxv - .byte W01 - .byte 46*se_c_maku_u_mvl/mxv - .byte W01 - .byte 58*se_c_maku_u_mvl/mxv - .byte W02 - .byte 70*se_c_maku_u_mvl/mxv - .byte W02 - .byte 60*se_c_maku_u_mvl/mxv - .byte W01 - .byte 42*se_c_maku_u_mvl/mxv - .byte W01 - .byte 22*se_c_maku_u_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_c_maku_u_2: - .byte KEYSH , se_c_maku_u_key+0 - .byte VOICE , 15 - .byte VOL , 12*se_c_maku_u_mvl/mxv - .byte BEND , c_v+0 - .byte N12 , Fn3 , v100 - .byte W01 - .byte VOL , 22*se_c_maku_u_mvl/mxv - .byte BEND , c_v+3 - .byte W01 - .byte VOL , 33*se_c_maku_u_mvl/mxv - .byte BEND , c_v+6 - .byte W01 - .byte VOL , 46*se_c_maku_u_mvl/mxv - .byte BEND , c_v+9 - .byte W01 - .byte VOL , 58*se_c_maku_u_mvl/mxv - .byte BEND , c_v+12 - .byte W02 - .byte VOL , 70*se_c_maku_u_mvl/mxv - .byte BEND , c_v+17 - .byte W01 - .byte c_v+20 - .byte W01 - .byte VOL , 60*se_c_maku_u_mvl/mxv - .byte BEND , c_v+25 - .byte W01 - .byte VOL , 42*se_c_maku_u_mvl/mxv - .byte BEND , c_v+32 - .byte W01 - .byte VOL , 22*se_c_maku_u_mvl/mxv - .byte BEND , c_v+38 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_maku_u: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_maku_u_pri @ Priority - .byte se_c_maku_u_rev @ Reverb. - - .word se_c_maku_u_grp - - .word se_c_maku_u_1 - .word se_c_maku_u_2 - - .end -- cgit v1.2.3 From b9989eaa562fab3e6c5da7c693417135497f440f Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:53:47 -0400 Subject: Match se_c_pasi.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/song_table.inc | 6 +++--- sound/songs/midi/se_c_pasi.mid | Bin 0 -> 86 bytes sound/songs/se_c_pasi.s | 45 ----------------------------------------- 5 files changed, 7 insertions(+), 49 deletions(-) create mode 100644 sound/songs/midi/se_c_pasi.mid delete mode 100644 sound/songs/se_c_pasi.s diff --git a/ld_script.txt b/ld_script.txt index f13e04072..91c7c6e18 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -663,7 +663,7 @@ SECTIONS { sound/songs/midi/se_c_gaji.o(.rodata); sound/songs/midi/se_c_maku_u.o(.rodata); sound/songs/midi/se_c_maku_d.o(.rodata); - sound/songs/se_c_pasi.o(.rodata); + sound/songs/midi/se_c_pasi.o(.rodata); sound/songs/se_c_syu.o(.rodata); sound/songs/se_c_pikon.o(.rodata); sound/songs/se_reapoke.o(.rodata); diff --git a/songs.mk b/songs.mk index 9afe371b2..71a89cf32 100644 --- a/songs.mk +++ b/songs.mk @@ -819,5 +819,8 @@ $(MID_SUBDIR)/se_c_maku_d.s: %.s: %.mid $(MID_SUBDIR)/se_c_maku_u.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5 +$(MID_SUBDIR)/se_c_pasi.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -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 9c4aa1b63..deef7692d 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -98,9 +98,9 @@ gSongTable:: @ 86B49F0 song se_basabasa, 1, 1 @ Wing Attack song se_regi, 1, 1 @ Cash Register song se_c_gaji, 1, 1 @ Contest Hearts - song se_c_maku_u, 1, 1 @ Contest Curtain rise - song se_c_maku_d, 1, 1 @ Contest Curtain fall - song se_c_pasi, 1, 1 + song se_c_maku_u, 1, 1 @ Contest Curtain Rises + song se_c_maku_d, 1, 1 @ Contest Curtain Falls + song se_c_pasi, 1, 1 @ Contest Inflict Status song se_c_syu, 1, 1 song se_c_pikon, 1, 1 @ Pokémon Appears in Contest song se_reapoke, 1, 1 @ Shiny Pokémon diff --git a/sound/songs/midi/se_c_pasi.mid b/sound/songs/midi/se_c_pasi.mid new file mode 100644 index 000000000..eea9c5707 Binary files /dev/null and b/sound/songs/midi/se_c_pasi.mid differ diff --git a/sound/songs/se_c_pasi.s b/sound/songs/se_c_pasi.s deleted file mode 100644 index 02da29a6d..000000000 --- a/sound/songs/se_c_pasi.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_pasi_grp, voicegroup128 - .equ se_c_pasi_pri, 5 - .equ se_c_pasi_rev, reverb_set+50 - .equ se_c_pasi_mvl, 127 - .equ se_c_pasi_key, 0 - .equ se_c_pasi_tbs, 1 - .equ se_c_pasi_exg, 0 - .equ se_c_pasi_cmp, 1 - - .section .rodata - .global se_c_pasi - .align 2 - -@********************** Track 1 **********************@ - -se_c_pasi_1: - .byte KEYSH , se_c_pasi_key+0 - .byte TEMPO , 150*se_c_pasi_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 110*se_c_pasi_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Gn3 , v112 - .byte W04 - .byte Gn4 , v064 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_pasi: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_pasi_pri @ Priority - .byte se_c_pasi_rev @ Reverb. - - .word se_c_pasi_grp - - .word se_c_pasi_1 - - .end -- cgit v1.2.3 From c98f5c25d674227b8d73273dab2b7980224f9d44 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:56:12 -0400 Subject: Match se_c_pikon.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/song_table.inc | 10 ++++---- sound/songs/midi/se_c_pikon.mid | Bin 0 -> 112 bytes sound/songs/se_c_pikon.s | 54 ---------------------------------------- 5 files changed, 9 insertions(+), 60 deletions(-) create mode 100644 sound/songs/midi/se_c_pikon.mid delete mode 100644 sound/songs/se_c_pikon.s diff --git a/ld_script.txt b/ld_script.txt index 91c7c6e18..b0d2cc476 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -665,7 +665,7 @@ SECTIONS { sound/songs/midi/se_c_maku_d.o(.rodata); sound/songs/midi/se_c_pasi.o(.rodata); sound/songs/se_c_syu.o(.rodata); - sound/songs/se_c_pikon.o(.rodata); + sound/songs/midi/se_c_pikon.o(.rodata); sound/songs/se_reapoke.o(.rodata); sound/songs/se_op_basyu.o(.rodata); sound/songs/midi/se_bt_start.o(.rodata); diff --git a/songs.mk b/songs.mk index 71a89cf32..f6c9113e8 100644 --- a/songs.mk +++ b/songs.mk @@ -822,5 +822,8 @@ $(MID_SUBDIR)/se_c_maku_u.s: %.s: %.mid $(MID_SUBDIR)/se_c_pasi.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 +$(MID_SUBDIR)/se_c_pikon.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -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 deef7692d..141105739 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -97,12 +97,12 @@ gSongTable:: @ 86B49F0 song se_tamakoro_e, 2, 2 @ Roulette Ball 2 song se_basabasa, 1, 1 @ Wing Attack song se_regi, 1, 1 @ Cash Register - song se_c_gaji, 1, 1 @ Contest Hearts - song se_c_maku_u, 1, 1 @ Contest Curtain Rises - song se_c_maku_d, 1, 1 @ Contest Curtain Falls - song se_c_pasi, 1, 1 @ Contest Inflict Status + song se_c_gaji, 1, 1 @ Contest - Hearts + song se_c_maku_u, 1, 1 @ Contest - Curtain Rises + song se_c_maku_d, 1, 1 @ Contest - Curtain Falls + song se_c_pasi, 1, 1 @ Contest - Inflict Status song se_c_syu, 1, 1 - song se_c_pikon, 1, 1 @ Pokémon Appears in Contest + song se_c_pikon, 1, 1 @ Contest - Pokémon Switches In song se_reapoke, 1, 1 @ Shiny Pokémon song se_op_basyu, 1, 1 @ Opening Movie -> Title Screen whoosh song se_bt_start, 1, 1 @ Battle Mugshot whoosh diff --git a/sound/songs/midi/se_c_pikon.mid b/sound/songs/midi/se_c_pikon.mid new file mode 100644 index 000000000..718a61443 Binary files /dev/null and b/sound/songs/midi/se_c_pikon.mid differ diff --git a/sound/songs/se_c_pikon.s b/sound/songs/se_c_pikon.s deleted file mode 100644 index 1e91ed760..000000000 --- a/sound/songs/se_c_pikon.s +++ /dev/null @@ -1,54 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_pikon_grp, voicegroup128 - .equ se_c_pikon_pri, 5 - .equ se_c_pikon_rev, reverb_set+50 - .equ se_c_pikon_mvl, 127 - .equ se_c_pikon_key, 0 - .equ se_c_pikon_tbs, 1 - .equ se_c_pikon_exg, 0 - .equ se_c_pikon_cmp, 1 - - .section .rodata - .global se_c_pikon - .align 2 - -@********************** Track 1 **********************@ - -se_c_pikon_1: - .byte KEYSH , se_c_pikon_key+0 - .byte TEMPO , 150*se_c_pikon_tbs/2 - .byte VOICE , 14 - .byte VOL , 90*se_c_pikon_mvl/mxv - .byte BEND , c_v-7 - .byte N02 , Cn5 , v112 - .byte W02 - .byte Cn6 - .byte W04 - .byte W01 - .byte Cn6 , v060 - .byte W05 - .byte W02 - .byte Cn5 , v112 - .byte W02 - .byte Cn6 - .byte W02 - .byte W03 - .byte Cn6 , v060 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_pikon: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_pikon_pri @ Priority - .byte se_c_pikon_rev @ Reverb. - - .word se_c_pikon_grp - - .word se_c_pikon_1 - - .end -- cgit v1.2.3 From f53a0ad0b6073954c764a7d91fbdc5f9bcbcf0c7 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 14:59:17 -0400 Subject: Match se_c_syu.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/song_table.inc | 2 +- sound/songs/midi/se_c_syu.mid | Bin 0 -> 112 bytes sound/songs/se_c_syu.s | 54 ------------------------------------------ 5 files changed, 5 insertions(+), 56 deletions(-) create mode 100644 sound/songs/midi/se_c_syu.mid delete mode 100644 sound/songs/se_c_syu.s diff --git a/ld_script.txt b/ld_script.txt index b0d2cc476..cc3823cbc 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -664,7 +664,7 @@ SECTIONS { sound/songs/midi/se_c_maku_u.o(.rodata); sound/songs/midi/se_c_maku_d.o(.rodata); sound/songs/midi/se_c_pasi.o(.rodata); - sound/songs/se_c_syu.o(.rodata); + sound/songs/midi/se_c_syu.o(.rodata); sound/songs/midi/se_c_pikon.o(.rodata); sound/songs/se_reapoke.o(.rodata); sound/songs/se_op_basyu.o(.rodata); diff --git a/songs.mk b/songs.mk index f6c9113e8..7c2b9b583 100644 --- a/songs.mk +++ b/songs.mk @@ -825,5 +825,8 @@ $(MID_SUBDIR)/se_c_pasi.s: %.s: %.mid $(MID_SUBDIR)/se_c_pikon.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 +$(MID_SUBDIR)/se_c_syu.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -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 141105739..d3c0bb838 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -101,7 +101,7 @@ gSongTable:: @ 86B49F0 song se_c_maku_u, 1, 1 @ Contest - Curtain Rises song se_c_maku_d, 1, 1 @ Contest - Curtain Falls song se_c_pasi, 1, 1 @ Contest - Inflict Status - song se_c_syu, 1, 1 + song se_c_syu, 1, 1 @ Contest - Pokémon Switches Out song se_c_pikon, 1, 1 @ Contest - Pokémon Switches In song se_reapoke, 1, 1 @ Shiny Pokémon song se_op_basyu, 1, 1 @ Opening Movie -> Title Screen whoosh diff --git a/sound/songs/midi/se_c_syu.mid b/sound/songs/midi/se_c_syu.mid new file mode 100644 index 000000000..3766d5f51 Binary files /dev/null and b/sound/songs/midi/se_c_syu.mid differ diff --git a/sound/songs/se_c_syu.s b/sound/songs/se_c_syu.s deleted file mode 100644 index c4d051397..000000000 --- a/sound/songs/se_c_syu.s +++ /dev/null @@ -1,54 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_syu_grp, voicegroup128 - .equ se_c_syu_pri, 5 - .equ se_c_syu_rev, reverb_set+50 - .equ se_c_syu_mvl, 127 - .equ se_c_syu_key, 0 - .equ se_c_syu_tbs, 1 - .equ se_c_syu_exg, 0 - .equ se_c_syu_cmp, 1 - - .section .rodata - .global se_c_syu - .align 2 - -@********************** Track 1 **********************@ - -se_c_syu_1: - .byte KEYSH , se_c_syu_key+0 - .byte TEMPO , 150*se_c_syu_tbs/2 - .byte VOICE , 36 - .byte VOL , 49*se_c_syu_mvl/mxv - .byte BEND , c_v-64 - .byte N03 , Cn6 , v112 - .byte W01 - .byte VOL , 68*se_c_syu_mvl/mxv - .byte BEND , c_v-1 - .byte W01 - .byte VOL , 90*se_c_syu_mvl/mxv - .byte BEND , c_v+63 - .byte W01 - .byte VOL , 69*se_c_syu_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Cn6 , v040 - .byte W01 - .byte VOL , 90*se_c_syu_mvl/mxv - .byte BEND , c_v+63 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_syu: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_syu_pri @ Priority - .byte se_c_syu_rev @ Reverb. - - .word se_c_syu_grp - - .word se_c_syu_1 - - .end -- cgit v1.2.3 From 6c890f7d9a3c759b7b2f54cca0debe803d491532 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:01:35 -0400 Subject: Match se_card.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_card.mid | Bin 0 -> 184 bytes sound/songs/se_card.s | 84 ------------------------------------------- 4 files changed, 4 insertions(+), 85 deletions(-) create mode 100644 sound/songs/midi/se_card.mid delete mode 100644 sound/songs/se_card.s diff --git a/ld_script.txt b/ld_script.txt index cc3823cbc..ed5665470 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -618,7 +618,7 @@ SECTIONS { sound/songs/se_track_haiki.o(.rodata); sound/songs/se_track_door.o(.rodata); sound/songs/se_moter.o(.rodata); - sound/songs/se_card.o(.rodata); + sound/songs/midi/se_card.o(.rodata); sound/songs/se_save.o(.rodata); sound/songs/se_kon.o(.rodata); sound/songs/se_kon2.o(.rodata); diff --git a/songs.mk b/songs.mk index 7c2b9b583..ad1b28f27 100644 --- a/songs.mk +++ b/songs.mk @@ -828,5 +828,8 @@ $(MID_SUBDIR)/se_c_pikon.s: %.s: %.mid $(MID_SUBDIR)/se_c_syu.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 +$(MID_SUBDIR)/se_card.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/songs/midi/se_card.mid b/sound/songs/midi/se_card.mid new file mode 100644 index 000000000..a6832a85f Binary files /dev/null and b/sound/songs/midi/se_card.mid differ diff --git a/sound/songs/se_card.s b/sound/songs/se_card.s deleted file mode 100644 index 703e516d5..000000000 --- a/sound/songs/se_card.s +++ /dev/null @@ -1,84 +0,0 @@ - .include "MPlayDef.s" - - .equ se_card_grp, voicegroup127 - .equ se_card_pri, 4 - .equ se_card_rev, reverb_set+50 - .equ se_card_mvl, 127 - .equ se_card_key, 0 - .equ se_card_tbs, 1 - .equ se_card_exg, 0 - .equ se_card_cmp, 1 - - .section .rodata - .global se_card - .align 2 - -@********************** Track 1 **********************@ - -se_card_1: - .byte KEYSH , se_card_key+0 - .byte TEMPO , 180*se_card_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 37*se_card_mvl/mxv - .byte BEND , c_v+63 - .byte N02 , Gn3 , v044 - .byte W01 - .byte VOL , 73*se_card_mvl/mxv - .byte W01 - .byte 100*se_card_mvl/mxv - .byte N01 , Gn4 - .byte W02 - .byte N30 , Cn4 , v127 - .byte W02 - .byte BEND , c_v+59 - .byte W01 - .byte VOL , 3*se_card_mvl/mxv - .byte W01 - .byte 25*se_card_mvl/mxv - .byte W01 - .byte 56*se_card_mvl/mxv - .byte BEND , c_v+55 - .byte W01 - .byte VOL , 77*se_card_mvl/mxv - .byte W02 - .byte 100*se_card_mvl/mxv - .byte BEND , c_v+46 - .byte W03 - .byte VOL , 92*se_card_mvl/mxv - .byte BEND , c_v+37 - .byte W03 - .byte VOL , 79*se_card_mvl/mxv - .byte BEND , c_v+28 - .byte W03 - .byte VOL , 66*se_card_mvl/mxv - .byte BEND , c_v+20 - .byte W03 - .byte VOL , 52*se_card_mvl/mxv - .byte BEND , c_v+11 - .byte W03 - .byte VOL , 38*se_card_mvl/mxv - .byte BEND , c_v+2 - .byte W03 - .byte VOL , 25*se_card_mvl/mxv - .byte BEND , c_v-7 - .byte W03 - .byte VOL , 11*se_card_mvl/mxv - .byte BEND , c_v-16 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_card: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_card_pri @ Priority - .byte se_card_rev @ Reverb. - - .word se_card_grp - - .word se_card_1 - - .end -- cgit v1.2.3 From 94e491357e1b01969e8f711dd5a588f2e5958065 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:04:57 -0400 Subject: Match se_curtain.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 4 +- sound/songs/midi/se_curtain.mid | Bin 0 -> 427 bytes sound/songs/se_curtain.s | 166 ---------------------------------------- 5 files changed, 6 insertions(+), 169 deletions(-) create mode 100644 sound/songs/midi/se_curtain.mid delete mode 100644 sound/songs/se_curtain.s diff --git a/ld_script.txt b/ld_script.txt index ed5665470..626dd1d83 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -831,7 +831,7 @@ SECTIONS { sound/songs/se_toreoff.o(.rodata); sound/songs/se_hantei1.o(.rodata); sound/songs/se_hantei2.o(.rodata); - sound/songs/se_curtain.o(.rodata); + sound/songs/midi/se_curtain.o(.rodata); sound/songs/se_curtain1.o(.rodata); sound/songs/se_ussoki.o(.rodata); sound/songs/midi/mus_tetsuji.o(.rodata); diff --git a/songs.mk b/songs.mk index ad1b28f27..4b61b8511 100644 --- a/songs.mk +++ b/songs.mk @@ -831,5 +831,8 @@ $(MID_SUBDIR)/se_c_syu.s: %.s: %.mid $(MID_SUBDIR)/se_card.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4 +$(MID_SUBDIR)/se_curtain.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -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 d3c0bb838..c166299a9 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -268,8 +268,8 @@ gSongTable:: @ 86B49F0 song se_toreoff, 1, 1 @ Trainer's Eye Hang Up song se_hantei1, 1, 1 @ Battle Arena Time's Up 1 song se_hantei2, 1, 1 @ Battle Arena Time's Up 2 - song se_curtain, 1, 1 @ Battle Pike Curtain Open - song se_curtain1, 1, 1 @ Battle Pike Curtain Close + song se_curtain, 1, 1 @ Battle Pike - Curtain Opens + song se_curtain1, 1, 1 @ Battle Pike - Curtain Closes song se_ussoki, 1, 1 @ Sudowoodo song dummy_song_header, 0, 0 song dummy_song_header, 0, 0 diff --git a/sound/songs/midi/se_curtain.mid b/sound/songs/midi/se_curtain.mid new file mode 100644 index 000000000..88c684318 Binary files /dev/null and b/sound/songs/midi/se_curtain.mid differ diff --git a/sound/songs/se_curtain.s b/sound/songs/se_curtain.s deleted file mode 100644 index e15fe4742..000000000 --- a/sound/songs/se_curtain.s +++ /dev/null @@ -1,166 +0,0 @@ - .include "MPlayDef.s" - - .equ se_curtain_grp, voicegroup129 - .equ se_curtain_pri, 5 - .equ se_curtain_rev, reverb_set+50 - .equ se_curtain_mvl, 127 - .equ se_curtain_key, 0 - .equ se_curtain_tbs, 1 - .equ se_curtain_exg, 0 - .equ se_curtain_cmp, 1 - - .section .rodata - .global se_curtain - .align 2 - -@********************** Track 1 **********************@ - -se_curtain_1: - .byte KEYSH , se_curtain_key+0 - .byte TEMPO , 98*se_curtain_tbs/2 - .byte PAN , c_v+0 - .byte VOL , 127*se_curtain_mvl/mxv - .byte W19 - .byte TEMPO , 112*se_curtain_tbs/2 - .byte VOICE , 38 - .byte MOD , 2 - .byte N04 , Gs1 , v120 - .byte W02 - .byte MOD , 7 - .byte W03 - .byte 1 - .byte N04 , Cn2 - .byte W02 - .byte MOD , 7 - .byte W02 - .byte 1 - .byte N04 , En2 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte 1 - .byte N04 , Gs2 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte 1 - .byte N04 , Cn3 - .byte W02 - .byte MOD , 7 - .byte W03 - .byte 1 - .byte N04 , Ds3 - .byte W02 - .byte MOD , 7 - .byte W03 - .byte 1 - .byte N04 , En3 , v096 - .byte W02 - .byte MOD , 7 - .byte W02 - .byte PAN , c_v-62 - .byte MOD , 1 - .byte N04 , En4 , v032 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte PAN , c_v+63 - .byte MOD , 1 - .byte N04 , En3 , v048 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte PAN , c_v-62 - .byte MOD , 1 - .byte N04 , En4 , v012 - .byte W02 - .byte MOD , 7 - .byte W03 - .byte PAN , c_v+63 - .byte MOD , 1 - .byte N04 , En3 , v032 - .byte W02 - .byte MOD , 7 - .byte W03 - .byte PAN , c_v-62 - .byte MOD , 1 - .byte N04 , En4 , v008 - .byte W02 - .byte MOD , 7 - .byte W02 - .byte 2 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_curtain_2: - .byte KEYSH , se_curtain_key+0 - .byte PAN , c_v+0 - .byte VOL , 112*se_curtain_mvl/mxv - .byte W19 - .byte VOICE , 100 - .byte W12 - .byte W07 - .byte N04 , Cn4 , v112 - .byte W05 - .byte As4 - .byte W07 - .byte Gs5 , v064 - .byte W05 - .byte Ds6 , v048 - .byte W07 - .byte Gn6 , v032 - .byte W05 - .byte W12 - .byte FINE - -@********************** Track 3 **********************@ - -se_curtain_3: - .byte KEYSH , se_curtain_key+0 - .byte VOICE , 125 - .byte LFOS , 44 - .byte XCMD , xIECV , 18 - .byte xIECV , 16 - .byte BENDR , 12 - .byte MOD , 2 - .byte VOL , 86*se_curtain_mvl/mxv - .byte BEND , c_v-57 - .byte N09 , Cn5 , v064 - .byte W01 - .byte BEND , c_v-45 - .byte W01 - .byte c_v-30 - .byte W01 - .byte c_v-18 - .byte W01 - .byte c_v-11 - .byte W02 - .byte c_v+0 - .byte W03 - .byte N01 , Gn5 , v096 - .byte W10 - .byte W12 - .byte W12 - .byte W12 - .byte W12 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_curtain: - .byte 3 @ NumTrks - .byte 0 @ NumBlks - .byte se_curtain_pri @ Priority - .byte se_curtain_rev @ Reverb. - - .word se_curtain_grp - - .word se_curtain_1 - .word se_curtain_2 - .word se_curtain_3 - - .end -- cgit v1.2.3 From 41a30f56bdb5b4d5d83e0bd2feb577486181ed57 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:07:53 -0400 Subject: Match se_curtain1.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/songs/midi/se_curtain1.mid | Bin 0 -> 418 bytes sound/songs/se_curtain1.s | 168 --------------------------------------- 4 files changed, 4 insertions(+), 169 deletions(-) create mode 100644 sound/songs/midi/se_curtain1.mid delete mode 100644 sound/songs/se_curtain1.s diff --git a/ld_script.txt b/ld_script.txt index 626dd1d83..b2168ba9a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -832,7 +832,7 @@ SECTIONS { sound/songs/se_hantei1.o(.rodata); sound/songs/se_hantei2.o(.rodata); sound/songs/midi/se_curtain.o(.rodata); - sound/songs/se_curtain1.o(.rodata); + sound/songs/midi/se_curtain1.o(.rodata); sound/songs/se_ussoki.o(.rodata); sound/songs/midi/mus_tetsuji.o(.rodata); sound/songs/midi/mus_field13.o(.rodata); diff --git a/songs.mk b/songs.mk index 4b61b8511..179e641ec 100644 --- a/songs.mk +++ b/songs.mk @@ -834,5 +834,8 @@ $(MID_SUBDIR)/se_card.s: %.s: %.mid $(MID_SUBDIR)/se_curtain.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 +$(MID_SUBDIR)/se_curtain1.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_curtain1.mid b/sound/songs/midi/se_curtain1.mid new file mode 100644 index 000000000..0a40e158e Binary files /dev/null and b/sound/songs/midi/se_curtain1.mid differ diff --git a/sound/songs/se_curtain1.s b/sound/songs/se_curtain1.s deleted file mode 100644 index 40e97ba13..000000000 --- a/sound/songs/se_curtain1.s +++ /dev/null @@ -1,168 +0,0 @@ - .include "MPlayDef.s" - - .equ se_curtain1_grp, voicegroup129 - .equ se_curtain1_pri, 5 - .equ se_curtain1_rev, reverb_set+50 - .equ se_curtain1_mvl, 127 - .equ se_curtain1_key, 0 - .equ se_curtain1_tbs, 1 - .equ se_curtain1_exg, 0 - .equ se_curtain1_cmp, 1 - - .section .rodata - .global se_curtain1 - .align 2 - -@********************** Track 1 **********************@ - -se_curtain1_1: - .byte VOL , 127*se_curtain1_mvl/mxv - .byte KEYSH , se_curtain1_key+0 - .byte TEMPO , 112*se_curtain1_tbs/2 - .byte VOICE , 38 - .byte MOD , 2 - .byte N04 , Gs1 , v120 - .byte W02 - .byte MOD , 7 - .byte W02 - .byte 1 - .byte N04 , Cn2 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte 1 - .byte N04 , En2 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte 1 - .byte N04 , Gs2 - .byte W02 - .byte MOD , 7 - .byte W03 - .byte 1 - .byte N04 , Cn3 - .byte W02 - .byte MOD , 7 - .byte W03 - .byte 1 - .byte N04 , Ds3 - .byte W02 - .byte MOD , 7 - .byte W02 - .byte 1 - .byte N04 , En3 , v096 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte PAN , c_v-62 - .byte MOD , 1 - .byte N04 , En4 , v032 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte PAN , c_v+63 - .byte MOD , 1 - .byte N04 , En3 , v048 - .byte W02 - .byte MOD , 7 - .byte W03 - .byte PAN , c_v-62 - .byte MOD , 1 - .byte N04 , En4 , v012 - .byte W02 - .byte MOD , 7 - .byte W03 - .byte PAN , c_v+63 - .byte MOD , 1 - .byte N04 , En3 , v032 - .byte W02 - .byte MOD , 7 - .byte W02 - .byte PAN , c_v-62 - .byte MOD , 1 - .byte N04 , En4 , v008 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte 2 - .byte W03 - .byte TEMPO , 98*se_curtain1_tbs/2 - .byte PAN , c_v+0 - .byte VOL , 127*se_curtain1_mvl/mxv - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_curtain1_2: - .byte VOL , 127*se_curtain1_mvl/mxv - .byte KEYSH , se_curtain1_key+0 - .byte VOICE , 100 - .byte W12 - .byte W07 - .byte N04 , Cn4 , v112 - .byte W05 - .byte As4 - .byte W07 - .byte Gs5 , v064 - .byte W05 - .byte Ds6 , v048 - .byte W07 - .byte Gn6 , v032 - .byte W05 - .byte W12 - .byte PAN , c_v+0 - .byte VOL , 112*se_curtain1_mvl/mxv - .byte W12 - .byte FINE - -@********************** Track 3 **********************@ - -se_curtain1_3: - .byte KEYSH , se_curtain1_key+0 - .byte W12 - .byte W12 - .byte W12 - .byte W12 - .byte W12 - .byte VOICE , 125 - .byte LFOS , 44 - .byte XCMD , xIECV , 18 - .byte xIECV , 16 - .byte BENDR , 12 - .byte MOD , 2 - .byte VOL , 86*se_curtain1_mvl/mxv - .byte BEND , c_v-57 - .byte N09 , Cn5 , v064 - .byte W01 - .byte BEND , c_v-45 - .byte W01 - .byte c_v-30 - .byte W01 - .byte c_v-18 - .byte W01 - .byte c_v-11 - .byte W02 - .byte c_v+0 - .byte W03 - .byte N01 , Gn5 , v096 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_curtain1: - .byte 3 @ NumTrks - .byte 0 @ NumBlks - .byte se_curtain1_pri @ Priority - .byte se_curtain1_rev @ Reverb. - - .word se_curtain1_grp - - .word se_curtain1_1 - .word se_curtain1_2 - .word se_curtain1_3 - - .end -- cgit v1.2.3 From c0064134d1dbf1fda968de2a78565fd2abb875e6 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:14:49 -0400 Subject: Match se_dansa.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_dansa.mid | Bin 0 -> 83 bytes sound/songs/se_dansa.s | 46 ------------------------------------------ 4 files changed, 4 insertions(+), 47 deletions(-) create mode 100644 sound/songs/midi/se_dansa.mid delete mode 100644 sound/songs/se_dansa.s diff --git a/ld_script.txt b/ld_script.txt index b2168ba9a..e03538e5c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -574,7 +574,7 @@ SECTIONS { sound/songs/se_wall_hit.o(.rodata); sound/songs/se_door.o(.rodata); sound/songs/se_kaidan.o(.rodata); - sound/songs/se_dansa.o(.rodata); + sound/songs/midi/se_dansa.o(.rodata); sound/songs/se_jitensya.o(.rodata); sound/songs/se_kouka_l.o(.rodata); sound/songs/se_kouka_m.o(.rodata); diff --git a/songs.mk b/songs.mk index 179e641ec..864e3597f 100644 --- a/songs.mk +++ b/songs.mk @@ -837,5 +837,8 @@ $(MID_SUBDIR)/se_curtain.s: %.s: %.mid $(MID_SUBDIR)/se_curtain1.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 +$(MID_SUBDIR)/se_dansa.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/songs/midi/se_dansa.mid b/sound/songs/midi/se_dansa.mid new file mode 100644 index 000000000..61eae0318 Binary files /dev/null and b/sound/songs/midi/se_dansa.mid differ diff --git a/sound/songs/se_dansa.s b/sound/songs/se_dansa.s deleted file mode 100644 index ccd7c4742..000000000 --- a/sound/songs/se_dansa.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_dansa_grp, voicegroup127 - .equ se_dansa_pri, 4 - .equ se_dansa_rev, reverb_set+50 - .equ se_dansa_mvl, 127 - .equ se_dansa_key, 0 - .equ se_dansa_tbs, 1 - .equ se_dansa_exg, 0 - .equ se_dansa_cmp, 1 - - .section .rodata - .global se_dansa - .align 2 - -@********************** Track 1 **********************@ - -se_dansa_1: - .byte KEYSH , se_dansa_key+0 - .byte TEMPO , 120*se_dansa_tbs/2 - .byte VOICE , 85 - .byte VOL , 100*se_dansa_mvl/mxv - .byte BEND , c_v-6 - .byte N02 , Ds2 , v052 - .byte W02 - .byte VOICE , 86 - .byte N06 , Gn3 , v092 - .byte W01 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_dansa: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_dansa_pri @ Priority - .byte se_dansa_rev @ Reverb. - - .word se_dansa_grp - - .word se_dansa_1 - - .end -- cgit v1.2.3 From 3b929049daf1ab24be43d45b62764115087fddae Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:17:05 -0400 Subject: Match se_daugi.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/song_table.inc | 2 +- sound/songs/midi/se_daugi.mid | Bin 0 -> 149 bytes sound/songs/se_daugi.s | 80 ------------------------------------------ 5 files changed, 5 insertions(+), 82 deletions(-) create mode 100644 sound/songs/midi/se_daugi.mid delete mode 100644 sound/songs/se_daugi.s diff --git a/ld_script.txt b/ld_script.txt index e03538e5c..ec3dd2f72 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -636,7 +636,7 @@ SECTIONS { sound/songs/se_toy_c1.o(.rodata); sound/songs/se_mizu.o(.rodata); sound/songs/se_hashi.o(.rodata); - sound/songs/se_daugi.o(.rodata); + sound/songs/midi/se_daugi.o(.rodata); sound/songs/se_pinpon.o(.rodata); sound/songs/se_fuusen1.o(.rodata); sound/songs/se_fuusen2.o(.rodata); diff --git a/songs.mk b/songs.mk index 864e3597f..4fd9964a1 100644 --- a/songs.mk +++ b/songs.mk @@ -840,5 +840,8 @@ $(MID_SUBDIR)/se_curtain1.s: %.s: %.mid $(MID_SUBDIR)/se_dansa.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4 +$(MID_SUBDIR)/se_daugi.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -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 c166299a9..0cced3b1f 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -73,7 +73,7 @@ gSongTable:: @ 86B49F0 song se_toy_c1, 2, 2 @ Note High C song se_mizu, 2, 2 @ Puddle song se_hashi, 2, 2 @ Boardwalk - song se_daugi, 1, 1 @ Slots Credits + song se_daugi, 1, 1 @ Slots - Credits song se_pinpon, 1, 1 @ Ding-dong! song se_fuusen1, 2, 2 @ Red Balloon song se_fuusen2, 2, 2 @ Blue Balloon diff --git a/sound/songs/midi/se_daugi.mid b/sound/songs/midi/se_daugi.mid new file mode 100644 index 000000000..9b6538a70 Binary files /dev/null and b/sound/songs/midi/se_daugi.mid differ diff --git a/sound/songs/se_daugi.s b/sound/songs/se_daugi.s deleted file mode 100644 index 88793920d..000000000 --- a/sound/songs/se_daugi.s +++ /dev/null @@ -1,80 +0,0 @@ - .include "MPlayDef.s" - - .equ se_daugi_grp, voicegroup127 - .equ se_daugi_pri, 5 - .equ se_daugi_rev, reverb_set+50 - .equ se_daugi_mvl, 127 - .equ se_daugi_key, 0 - .equ se_daugi_tbs, 1 - .equ se_daugi_exg, 0 - .equ se_daugi_cmp, 1 - - .section .rodata - .global se_daugi - .align 2 - -@********************** Track 1 **********************@ - -se_daugi_1: - .byte KEYSH , se_daugi_key+0 - .byte TEMPO , 128*se_daugi_tbs/2 - .byte VOICE , 89 - .byte BENDR , 12 - .byte VOL , 90*se_daugi_mvl/mxv - .byte BEND , c_v-1 - .byte N03 , Fs2 , v127 - .byte W03 - .byte N01 , Ds3 - .byte W03 - .byte VOICE , 6 - .byte N03 , Gs3 , v100 - .byte W03 - .byte W01 - .byte N18 , Fn5 , v072 - .byte W02 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_daugi_2: - .byte KEYSH , se_daugi_key+0 - .byte VOICE , 14 - .byte VOL , 90*se_daugi_mvl/mxv - .byte BEND , c_v-8 - .byte N03 , Gs3 , v100 - .byte W03 - .byte W03 - .byte Gs3 , v060 - .byte W03 - .byte W01 - .byte N18 , Fn5 - .byte W02 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_daugi: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_daugi_pri @ Priority - .byte se_daugi_rev @ Reverb. - - .word se_daugi_grp - - .word se_daugi_1 - .word se_daugi_2 - - .end -- cgit v1.2.3 From b985d45ddbcbeb92b1a3f660bf1a0f6ba4b82291 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:21:53 -0400 Subject: Match se_dendou.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/songs/midi/se_dendou.mid | Bin 0 -> 703 bytes sound/songs/se_dendou.s | 197 ----------------------------------------- 4 files changed, 4 insertions(+), 198 deletions(-) create mode 100644 sound/songs/midi/se_dendou.mid delete mode 100644 sound/songs/se_dendou.s diff --git a/ld_script.txt b/ld_script.txt index ec3dd2f72..a4aff88c7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -669,7 +669,7 @@ SECTIONS { sound/songs/se_reapoke.o(.rodata); sound/songs/se_op_basyu.o(.rodata); sound/songs/midi/se_bt_start.o(.rodata); - sound/songs/se_dendou.o(.rodata); + sound/songs/midi/se_dendou.o(.rodata); sound/songs/se_jihanki.o(.rodata); sound/songs/se_tama.o(.rodata); sound/songs/se_z_scroll.o(.rodata); diff --git a/songs.mk b/songs.mk index 4fd9964a1..172f2d2ef 100644 --- a/songs.mk +++ b/songs.mk @@ -843,5 +843,8 @@ $(MID_SUBDIR)/se_dansa.s: %.s: %.mid $(MID_SUBDIR)/se_daugi.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 +$(MID_SUBDIR)/se_dendou.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_dendou.mid b/sound/songs/midi/se_dendou.mid new file mode 100644 index 000000000..4ab2a2212 Binary files /dev/null and b/sound/songs/midi/se_dendou.mid differ diff --git a/sound/songs/se_dendou.s b/sound/songs/se_dendou.s deleted file mode 100644 index 4fda6d338..000000000 --- a/sound/songs/se_dendou.s +++ /dev/null @@ -1,197 +0,0 @@ - .include "MPlayDef.s" - - .equ se_dendou_grp, voicegroup128 - .equ se_dendou_pri, 5 - .equ se_dendou_rev, reverb_set+50 - .equ se_dendou_mvl, 127 - .equ se_dendou_key, 0 - .equ se_dendou_tbs, 1 - .equ se_dendou_exg, 0 - .equ se_dendou_cmp, 1 - - .section .rodata - .global se_dendou - .align 2 - -@********************** Track 1 **********************@ - -se_dendou_1: - .byte KEYSH , se_dendou_key+0 - .byte TEMPO , 150*se_dendou_tbs/2 - .byte VOICE , 60 - .byte BENDR , 12 - .byte VOL , 25*se_dendou_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte TIE , Bn2 , v127 - .byte W01 - .byte PAN , c_v+2 - .byte W01 - .byte c_v+5 - .byte W01 - .byte VOL , 34*se_dendou_mvl/mxv - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 46*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 56*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W01 - .byte VOL , 70*se_dendou_mvl/mxv - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 80*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 88*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte VOL , 96*se_dendou_mvl/mxv - .byte PAN , c_v+5 - .byte W02 - .byte c_v+2 - .byte W02 - .byte VOL , 100*se_dendou_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte c_v-2 - .byte W02 -se_dendou_1_000: - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W02 - .byte c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte c_v-2 - .byte W02 - .byte PEND - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte PATT - .word se_dendou_1_000 - .byte VOL , 96*se_dendou_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W01 - .byte VOL , 92*se_dendou_mvl/mxv - .byte W01 - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 84*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W02 - .byte VOL , 72*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte c_v+2 - .byte W01 - .byte VOL , 63*se_dendou_mvl/mxv - .byte PAN , c_v+5 - .byte W02 - .byte VOL , 52*se_dendou_mvl/mxv - .byte PAN , c_v+2 - .byte W02 - .byte c_v+0 - .byte W01 - .byte VOL , 37*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W01 - .byte c_v-4 - .byte W01 - .byte VOL , 22*se_dendou_mvl/mxv - .byte W01 - .byte 12*se_dendou_mvl/mxv - .byte PAN , c_v-2 - .byte W02 - .byte EOT , Bn2 - .byte FINE - -@******************************************************@ - .align 2 - -se_dendou: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_dendou_pri @ Priority - .byte se_dendou_rev @ Reverb. - - .word se_dendou_grp - - .word se_dendou_1 - - .end -- cgit v1.2.3 From 615ad808bf001d2737112e7467f0a1a260e51ba3 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:24:27 -0400 Subject: Match se_doku.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/song_table.inc | 2 +- sound/songs/midi/se_doku.mid | Bin 0 -> 107 bytes sound/songs/se_doku.s | 50 ------------------------------------------- 5 files changed, 5 insertions(+), 52 deletions(-) create mode 100644 sound/songs/midi/se_doku.mid delete mode 100644 sound/songs/se_doku.s 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); diff --git a/songs.mk b/songs.mk index 172f2d2ef..7475f0879 100644 --- a/songs.mk +++ b/songs.mk @@ -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 new file mode 100644 index 000000000..83841203a Binary files /dev/null and b/sound/songs/midi/se_doku.mid differ 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 -- cgit v1.2.3 From 264bd34bdd84610177f02704294cc0515b9e27c2 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:26:20 -0400 Subject: Match se_door.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_door.mid | Bin 0 -> 76 bytes sound/songs/se_door.s | 42 ------------------------------------------ 4 files changed, 4 insertions(+), 43 deletions(-) create mode 100644 sound/songs/midi/se_door.mid delete mode 100644 sound/songs/se_door.s diff --git a/ld_script.txt b/ld_script.txt index 3463c9fd9..59b3a790b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -572,7 +572,7 @@ SECTIONS { sound/songs/se_select.o(.rodata); sound/songs/se_win_open.o(.rodata); sound/songs/se_wall_hit.o(.rodata); - sound/songs/se_door.o(.rodata); + sound/songs/midi/se_door.o(.rodata); sound/songs/se_kaidan.o(.rodata); sound/songs/midi/se_dansa.o(.rodata); sound/songs/se_jitensya.o(.rodata); diff --git a/songs.mk b/songs.mk index 7475f0879..2d77f6acf 100644 --- a/songs.mk +++ b/songs.mk @@ -849,5 +849,8 @@ $(MID_SUBDIR)/se_dendou.s: %.s: %.mid $(MID_SUBDIR)/se_doku.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 +$(MID_SUBDIR)/se_door.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_door.mid b/sound/songs/midi/se_door.mid new file mode 100644 index 000000000..004889e93 Binary files /dev/null and b/sound/songs/midi/se_door.mid differ diff --git a/sound/songs/se_door.s b/sound/songs/se_door.s deleted file mode 100644 index e4b23dddd..000000000 --- a/sound/songs/se_door.s +++ /dev/null @@ -1,42 +0,0 @@ - .include "MPlayDef.s" - - .equ se_door_grp, voicegroup127 - .equ se_door_pri, 5 - .equ se_door_rev, reverb_set+50 - .equ se_door_mvl, 127 - .equ se_door_key, 0 - .equ se_door_tbs, 1 - .equ se_door_exg, 0 - .equ se_door_cmp, 1 - - .section .rodata - .global se_door - .align 2 - -@********************** Track 1 **********************@ - -se_door_1: - .byte KEYSH , se_door_key+0 - .byte TEMPO , 110*se_door_tbs/2 - .byte VOICE , 127 - .byte VOL , 80*se_door_mvl/mxv - .byte N03 , Dn3 , v127 - .byte W06 - .byte N12 , Fs3 - .byte W18 - .byte FINE - -@******************************************************@ - .align 2 - -se_door: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_door_pri @ Priority - .byte se_door_rev @ Reverb. - - .word se_door_grp - - .word se_door_1 - - .end -- cgit v1.2.3 From c44d355f6fefe580ea1a04d1c4f92c4af036aa09 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:28:17 -0400 Subject: Match se_e.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_e.mid | Bin 0 -> 75 bytes sound/songs/se_e.s | 45 --------------------------------------------- 4 files changed, 4 insertions(+), 46 deletions(-) create mode 100644 sound/songs/midi/se_e.mid delete mode 100644 sound/songs/se_e.s diff --git a/ld_script.txt b/ld_script.txt index 59b3a790b..964b3148e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -592,7 +592,7 @@ SECTIONS { sound/songs/midi/se_a.o(.rodata); sound/songs/se_i.o(.rodata); sound/songs/se_u.o(.rodata); - sound/songs/se_e.o(.rodata); + sound/songs/midi/se_e.o(.rodata); sound/songs/se_o.o(.rodata); sound/songs/se_n.o(.rodata); sound/songs/se_seikai.o(.rodata); diff --git a/songs.mk b/songs.mk index 2d77f6acf..131183fa7 100644 --- a/songs.mk +++ b/songs.mk @@ -852,5 +852,8 @@ $(MID_SUBDIR)/se_doku.s: %.s: %.mid $(MID_SUBDIR)/se_door.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5 +$(MID_SUBDIR)/se_e.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_e.mid b/sound/songs/midi/se_e.mid new file mode 100644 index 000000000..79485cbc9 Binary files /dev/null and b/sound/songs/midi/se_e.mid differ diff --git a/sound/songs/se_e.s b/sound/songs/se_e.s deleted file mode 100644 index aa9b91844..000000000 --- a/sound/songs/se_e.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_e_grp, voicegroup128 - .equ se_e_pri, 4 - .equ se_e_rev, reverb_set+50 - .equ se_e_mvl, 127 - .equ se_e_key, 0 - .equ se_e_tbs, 1 - .equ se_e_exg, 0 - .equ se_e_cmp, 1 - - .section .rodata - .global se_e - .align 2 - -@********************** Track 1 **********************@ - -se_e_1: - .byte KEYSH , se_e_key+0 - .byte TEMPO , 240*se_e_tbs/2 - .byte VOICE , 125 - .byte BENDR , 12 - .byte VOL , 120*se_e_mvl/mxv - .byte BEND , c_v+0 - .byte N72 , Cn3 , v127 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_e: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_e_pri @ Priority - .byte se_e_rev @ Reverb. - - .word se_e_grp - - .word se_e_1 - - .end -- cgit v1.2.3 From 1d241702f225b5be32dcba80cefcefa617320985 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:30:17 -0400 Subject: Match se_elebeta.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_elebeta.mid | Bin 0 -> 104 bytes sound/songs/se_elebeta.s | 71 ---------------------------------------- 4 files changed, 4 insertions(+), 72 deletions(-) create mode 100644 sound/songs/midi/se_elebeta.mid delete mode 100644 sound/songs/se_elebeta.s diff --git a/ld_script.txt b/ld_script.txt index 964b3148e..cb244a70e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -653,7 +653,7 @@ SECTIONS { sound/songs/se_t_koame_e.o(.rodata); sound/songs/se_t_kami.o(.rodata); sound/songs/se_t_kami2.o(.rodata); - sound/songs/se_elebeta.o(.rodata); + sound/songs/midi/se_elebeta.o(.rodata); sound/songs/se_hinsi.o(.rodata); sound/songs/se_expmax.o(.rodata); sound/songs/se_tamakoro.o(.rodata); diff --git a/songs.mk b/songs.mk index 131183fa7..c7af5bc13 100644 --- a/songs.mk +++ b/songs.mk @@ -855,5 +855,8 @@ $(MID_SUBDIR)/se_door.s: %.s: %.mid $(MID_SUBDIR)/se_e.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 +$(MID_SUBDIR)/se_elebeta.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_elebeta.mid b/sound/songs/midi/se_elebeta.mid new file mode 100644 index 000000000..66ee5fd1f Binary files /dev/null and b/sound/songs/midi/se_elebeta.mid differ diff --git a/sound/songs/se_elebeta.s b/sound/songs/se_elebeta.s deleted file mode 100644 index ad19476d5..000000000 --- a/sound/songs/se_elebeta.s +++ /dev/null @@ -1,71 +0,0 @@ - .include "MPlayDef.s" - - .equ se_elebeta_grp, voicegroup128 - .equ se_elebeta_pri, 4 - .equ se_elebeta_rev, reverb_set+50 - .equ se_elebeta_mvl, 127 - .equ se_elebeta_key, 0 - .equ se_elebeta_tbs, 1 - .equ se_elebeta_exg, 0 - .equ se_elebeta_cmp, 1 - - .section .rodata - .global se_elebeta - .align 2 - -@********************** Track 1 **********************@ - -se_elebeta_1: - .byte KEYSH , se_elebeta_key+0 - .byte TEMPO , 150*se_elebeta_tbs/2 - .byte VOICE , 38 - .byte BENDR , 2 - .byte VOL , 100*se_elebeta_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Fs4 , v080 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte EOT - .byte FINE - -@********************** Track 2 **********************@ - -se_elebeta_2: - .byte KEYSH , se_elebeta_key+0 - .byte VOICE , 27 - .byte VOL , 100*se_elebeta_mvl/mxv - .byte TIE , Fn3 , v032 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_elebeta: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_elebeta_pri @ Priority - .byte se_elebeta_rev @ Reverb. - - .word se_elebeta_grp - - .word se_elebeta_1 - .word se_elebeta_2 - - .end -- cgit v1.2.3 From 599d80b937f19e750b896df345f792d19db71ed2 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:32:04 -0400 Subject: Match se_esuka.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_esuka.mid | Bin 0 -> 174 bytes sound/songs/se_esuka.s | 93 ------------------------------------------ 4 files changed, 4 insertions(+), 94 deletions(-) create mode 100644 sound/songs/midi/se_esuka.mid delete mode 100644 sound/songs/se_esuka.s diff --git a/ld_script.txt b/ld_script.txt index cb244a70e..dea61f820 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -644,7 +644,7 @@ SECTIONS { sound/songs/se_toy_kabe.o(.rodata); sound/songs/se_toy_dango.o(.rodata); sound/songs/midi/se_doku.o(.rodata); - sound/songs/se_esuka.o(.rodata); + sound/songs/midi/se_esuka.o(.rodata); sound/songs/se_t_ame.o(.rodata); sound/songs/se_t_ame_e.o(.rodata); sound/songs/se_t_ooame.o(.rodata); diff --git a/songs.mk b/songs.mk index c7af5bc13..8cee992ec 100644 --- a/songs.mk +++ b/songs.mk @@ -858,5 +858,8 @@ $(MID_SUBDIR)/se_e.s: %.s: %.mid $(MID_SUBDIR)/se_elebeta.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_esuka.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_esuka.mid b/sound/songs/midi/se_esuka.mid new file mode 100644 index 000000000..6a9e22a5b Binary files /dev/null and b/sound/songs/midi/se_esuka.mid differ diff --git a/sound/songs/se_esuka.s b/sound/songs/se_esuka.s deleted file mode 100644 index 88e88fcd3..000000000 --- a/sound/songs/se_esuka.s +++ /dev/null @@ -1,93 +0,0 @@ - .include "MPlayDef.s" - - .equ se_esuka_grp, voicegroup128 - .equ se_esuka_pri, 4 - .equ se_esuka_rev, reverb_set+50 - .equ se_esuka_mvl, 127 - .equ se_esuka_key, 0 - .equ se_esuka_tbs, 1 - .equ se_esuka_exg, 0 - .equ se_esuka_cmp, 1 - - .section .rodata - .global se_esuka - .align 2 - -@********************** Track 1 **********************@ - -se_esuka_1: - .byte KEYSH , se_esuka_key+0 - .byte TEMPO , 150*se_esuka_tbs/2 - .byte VOICE , 38 - .byte BENDR , 2 - .byte VOL , 51*se_esuka_mvl/mxv - .byte BEND , c_v-32 - .byte TIE , En5 , v080 - .byte W01 - .byte BEND , c_v-26 - .byte W01 - .byte VOL , 56*se_esuka_mvl/mxv - .byte W01 - .byte BEND , c_v-21 - .byte W01 - .byte VOL , 62*se_esuka_mvl/mxv - .byte W02 - .byte BEND , c_v-15 - .byte W01 - .byte VOL , 69*se_esuka_mvl/mxv - .byte W01 - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 75*se_esuka_mvl/mxv - .byte W01 - .byte BEND , c_v+0 - .byte W02 - .byte VOL , 85*se_esuka_mvl/mxv - .byte W02 - .byte 92*se_esuka_mvl/mxv - .byte W02 - .byte 100*se_esuka_mvl/mxv - .byte W08 - .byte W24 - .byte W24 - .byte W24 - .byte W03 - .byte 96*se_esuka_mvl/mxv - .byte W03 - .byte 88*se_esuka_mvl/mxv - .byte W03 - .byte 81*se_esuka_mvl/mxv - .byte BEND , c_v-5 - .byte W03 - .byte VOL , 74*se_esuka_mvl/mxv - .byte BEND , c_v-8 - .byte W02 - .byte VOL , 62*se_esuka_mvl/mxv - .byte BEND , c_v-12 - .byte W02 - .byte VOL , 49*se_esuka_mvl/mxv - .byte BEND , c_v-21 - .byte W03 - .byte VOL , 39*se_esuka_mvl/mxv - .byte BEND , c_v-26 - .byte W02 - .byte VOL , 25*se_esuka_mvl/mxv - .byte BEND , c_v-32 - .byte W03 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_esuka: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_esuka_pri @ Priority - .byte se_esuka_rev @ Reverb. - - .word se_esuka_grp - - .word se_esuka_1 - - .end -- cgit v1.2.3 From fd74c65631c84eb2aa93631a3795dd7432f54970 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:37:03 -0400 Subject: Match se_exp.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/songs/midi/se_exp.mid | Bin 0 -> 621 bytes sound/songs/se_exp.s | 333 -------------------------------------------- 4 files changed, 4 insertions(+), 334 deletions(-) create mode 100644 sound/songs/midi/se_exp.mid delete mode 100644 sound/songs/se_exp.s diff --git a/ld_script.txt b/ld_script.txt index dea61f820..4abc87db3 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -597,7 +597,7 @@ SECTIONS { sound/songs/se_n.o(.rodata); sound/songs/se_seikai.o(.rodata); sound/songs/se_hazure.o(.rodata); - sound/songs/se_exp.o(.rodata); + sound/songs/midi/se_exp.o(.rodata); sound/songs/se_jite_pyoko.o(.rodata); sound/songs/se_mu_pachi.o(.rodata); sound/songs/se_tk_kasya.o(.rodata); diff --git a/songs.mk b/songs.mk index 8cee992ec..471dda4ba 100644 --- a/songs.mk +++ b/songs.mk @@ -861,5 +861,8 @@ $(MID_SUBDIR)/se_elebeta.s: %.s: %.mid $(MID_SUBDIR)/se_esuka.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_exp.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_exp.mid b/sound/songs/midi/se_exp.mid new file mode 100644 index 000000000..dc9f2fada Binary files /dev/null and b/sound/songs/midi/se_exp.mid differ diff --git a/sound/songs/se_exp.s b/sound/songs/se_exp.s deleted file mode 100644 index f58767b8f..000000000 --- a/sound/songs/se_exp.s +++ /dev/null @@ -1,333 +0,0 @@ - .include "MPlayDef.s" - - .equ se_exp_grp, voicegroup127 - .equ se_exp_pri, 5 - .equ se_exp_rev, reverb_set+50 - .equ se_exp_mvl, 127 - .equ se_exp_key, 0 - .equ se_exp_tbs, 1 - .equ se_exp_exg, 0 - .equ se_exp_cmp, 1 - - .section .rodata - .global se_exp - .align 2 - -@********************** Track 1 **********************@ - -se_exp_1: - .byte KEYSH , se_exp_key+0 - .byte TEMPO , 240*se_exp_tbs/2 - .byte VOICE , 19 - .byte BENDR , 26 - .byte VOL , 80*se_exp_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte TIE , Fn3 , v112 - .byte W01 - .byte BEND , c_v+8 - .byte W01 - .byte c_v+16 - .byte W01 - .byte c_v+22 - .byte W01 - .byte c_v+31 - .byte W02 - .byte c_v+38 - .byte W01 - .byte VOL , 71*se_exp_mvl/mxv - .byte BEND , c_v+8 - .byte W01 - .byte c_v+16 - .byte W01 - .byte c_v+22 - .byte W01 - .byte c_v+31 - .byte W02 - .byte c_v+38 - .byte W01 - .byte c_v+15 - .byte W01 - .byte VOL , 50*se_exp_mvl/mxv - .byte BEND , c_v+1 - .byte W01 - .byte c_v+0 - .byte W01 - .byte c_v+0 - .byte W02 - .byte c_v+3 - .byte W01 - .byte VOL , 51*se_exp_mvl/mxv - .byte BEND , c_v+3 - .byte W01 - .byte c_v+2 - .byte W01 - .byte c_v+5 - .byte W01 - .byte c_v+4 - .byte W02 - .byte VOL , 52*se_exp_mvl/mxv - .byte BEND , c_v+4 - .byte W01 - .byte c_v+7 - .byte W01 - .byte c_v+6 - .byte W01 - .byte c_v+5 - .byte W01 - .byte VOL , 52*se_exp_mvl/mxv - .byte BEND , c_v+8 - .byte W02 - .byte c_v+8 - .byte W01 - .byte c_v+7 - .byte W01 - .byte c_v+10 - .byte W01 - .byte VOL , 54*se_exp_mvl/mxv - .byte BEND , c_v+10 - .byte W01 - .byte c_v+9 - .byte W02 - .byte c_v+12 - .byte W01 - .byte c_v+12 - .byte W01 - .byte VOL , 55*se_exp_mvl/mxv - .byte BEND , c_v+11 - .byte W01 - .byte c_v+14 - .byte W01 - .byte c_v+13 - .byte W02 - .byte c_v+12 - .byte W01 - .byte VOL , 56*se_exp_mvl/mxv - .byte BEND , c_v+16 - .byte W01 - .byte c_v+15 - .byte W01 - .byte c_v+14 - .byte W01 - .byte c_v+17 - .byte W02 - .byte VOL , 57*se_exp_mvl/mxv - .byte BEND , c_v+17 - .byte W01 - .byte c_v+16 - .byte W01 - .byte c_v+20 - .byte W01 - .byte c_v+19 - .byte W01 - .byte VOL , 57*se_exp_mvl/mxv - .byte BEND , c_v+19 - .byte W02 - .byte c_v+21 - .byte W01 - .byte c_v+20 - .byte W01 - .byte c_v+20 - .byte W01 - .byte VOL , 59*se_exp_mvl/mxv - .byte BEND , c_v+23 - .byte W01 - .byte c_v+22 - .byte W02 - .byte c_v+21 - .byte W01 - .byte c_v+25 - .byte W01 - .byte VOL , 60*se_exp_mvl/mxv - .byte BEND , c_v+24 - .byte W01 - .byte c_v+23 - .byte W01 - .byte c_v+26 - .byte W02 - .byte c_v+25 - .byte W01 - .byte VOL , 61*se_exp_mvl/mxv - .byte BEND , c_v+24 - .byte W01 - .byte c_v+28 - .byte W01 - .byte c_v+27 - .byte W01 - .byte c_v+26 - .byte W02 - .byte VOL , 62*se_exp_mvl/mxv - .byte BEND , c_v+30 - .byte W01 - .byte c_v+29 - .byte W01 - .byte c_v+28 - .byte W01 - .byte c_v+32 - .byte W01 - .byte VOL , 62*se_exp_mvl/mxv - .byte BEND , c_v+30 - .byte W02 - .byte c_v+30 - .byte W01 - .byte c_v+33 - .byte W01 - .byte c_v+32 - .byte W01 - .byte VOL , 64*se_exp_mvl/mxv - .byte BEND , c_v+31 - .byte W01 - .byte c_v+35 - .byte W02 - .byte c_v+34 - .byte W01 - .byte c_v+33 - .byte W01 - .byte VOL , 65*se_exp_mvl/mxv - .byte BEND , c_v+37 - .byte W01 - .byte c_v+36 - .byte W01 - .byte c_v+35 - .byte W02 - .byte c_v+39 - .byte W01 - .byte VOL , 66*se_exp_mvl/mxv - .byte BEND , c_v+38 - .byte W01 - .byte c_v+37 - .byte W01 - .byte c_v+40 - .byte W01 - .byte c_v+39 - .byte W02 - .byte VOL , 67*se_exp_mvl/mxv - .byte BEND , c_v+38 - .byte W01 - .byte c_v+42 - .byte W01 - .byte c_v+41 - .byte W01 - .byte c_v+40 - .byte W01 - .byte VOL , 68*se_exp_mvl/mxv - .byte BEND , c_v+44 - .byte W02 - .byte c_v+43 - .byte W01 - .byte c_v+42 - .byte W01 - .byte c_v+46 - .byte W01 - .byte VOL , 69*se_exp_mvl/mxv - .byte BEND , c_v+45 - .byte W01 - .byte c_v+44 - .byte W02 - .byte c_v+48 - .byte W01 - .byte c_v+46 - .byte W01 - .byte VOL , 70*se_exp_mvl/mxv - .byte BEND , c_v+45 - .byte W01 - .byte c_v+49 - .byte W01 - .byte c_v+48 - .byte W02 - .byte c_v+48 - .byte W01 - .byte VOL , 71*se_exp_mvl/mxv - .byte BEND , c_v+51 - .byte W01 - .byte c_v+50 - .byte W01 - .byte c_v+49 - .byte W01 - .byte c_v+53 - .byte W02 - .byte VOL , 72*se_exp_mvl/mxv - .byte BEND , c_v+52 - .byte W01 - .byte c_v+51 - .byte W01 - .byte c_v+55 - .byte W01 - .byte c_v+53 - .byte W01 - .byte VOL , 73*se_exp_mvl/mxv - .byte BEND , c_v+52 - .byte W02 - .byte c_v+56 - .byte W01 - .byte c_v+55 - .byte W01 - .byte c_v+54 - .byte W01 - .byte VOL , 74*se_exp_mvl/mxv - .byte BEND , c_v+58 - .byte W01 - .byte c_v+57 - .byte W02 - .byte c_v+56 - .byte W01 - .byte c_v+59 - .byte W01 - .byte VOL , 75*se_exp_mvl/mxv - .byte BEND , c_v+59 - .byte W01 - .byte c_v+58 - .byte W01 - .byte c_v+62 - .byte W02 - .byte c_v+61 - .byte W01 - .byte VOL , 76*se_exp_mvl/mxv - .byte BEND , c_v+60 - .byte W01 - .byte c_v+63 - .byte W01 - .byte c_v+62 - .byte W01 - .byte c_v+61 - .byte W02 - .byte VOL , 77*se_exp_mvl/mxv - .byte BEND , c_v+63 - .byte W01 - .byte c_v+62 - .byte W01 - .byte c_v+61 - .byte W01 - .byte c_v+63 - .byte W01 - .byte VOL , 78*se_exp_mvl/mxv - .byte BEND , c_v+62 - .byte W02 - .byte c_v+61 - .byte W01 - .byte c_v+63 - .byte W01 - .byte c_v+62 - .byte W01 - .byte VOL , 79*se_exp_mvl/mxv - .byte BEND , c_v+61 - .byte W01 - .byte c_v+63 - .byte W02 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_exp: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_exp_pri @ Priority - .byte se_exp_rev @ Reverb. - - .word se_exp_grp - - .word se_exp_1 - - .end -- cgit v1.2.3 From e66fb45f242b110ebdec8a38d66a160a40f1446b Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:42:53 -0400 Subject: Match se_expmax.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_exp.mid | Bin 621 -> 621 bytes sound/songs/midi/se_expmax.mid | Bin 0 -> 138 bytes sound/songs/se_expmax.s | 76 ----------------------------------------- 5 files changed, 4 insertions(+), 77 deletions(-) create mode 100644 sound/songs/midi/se_expmax.mid delete mode 100644 sound/songs/se_expmax.s diff --git a/ld_script.txt b/ld_script.txt index 4abc87db3..a2f9064cb 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -655,7 +655,7 @@ SECTIONS { sound/songs/se_t_kami2.o(.rodata); sound/songs/midi/se_elebeta.o(.rodata); sound/songs/se_hinsi.o(.rodata); - sound/songs/se_expmax.o(.rodata); + sound/songs/midi/se_expmax.o(.rodata); sound/songs/se_tamakoro.o(.rodata); sound/songs/se_tamakoro_e.o(.rodata); sound/songs/midi/se_basabasa.o(.rodata); diff --git a/songs.mk b/songs.mk index 471dda4ba..acc900b34 100644 --- a/songs.mk +++ b/songs.mk @@ -864,5 +864,8 @@ $(MID_SUBDIR)/se_esuka.s: %.s: %.mid $(MID_SUBDIR)/se_exp.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5 +$(MID_SUBDIR)/se_expmax.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V094 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_exp.mid b/sound/songs/midi/se_exp.mid index dc9f2fada..fa75616b5 100644 Binary files a/sound/songs/midi/se_exp.mid and b/sound/songs/midi/se_exp.mid differ diff --git a/sound/songs/midi/se_expmax.mid b/sound/songs/midi/se_expmax.mid new file mode 100644 index 000000000..8772e915e Binary files /dev/null and b/sound/songs/midi/se_expmax.mid differ diff --git a/sound/songs/se_expmax.s b/sound/songs/se_expmax.s deleted file mode 100644 index a3a8478b2..000000000 --- a/sound/songs/se_expmax.s +++ /dev/null @@ -1,76 +0,0 @@ - .include "MPlayDef.s" - - .equ se_expmax_grp, voicegroup128 - .equ se_expmax_pri, 5 - .equ se_expmax_rev, reverb_set+50 - .equ se_expmax_mvl, 127 - .equ se_expmax_key, 0 - .equ se_expmax_tbs, 1 - .equ se_expmax_exg, 0 - .equ se_expmax_cmp, 1 - - .section .rodata - .global se_expmax - .align 2 - -@********************** Track 1 **********************@ - -se_expmax_1: - .byte KEYSH , se_expmax_key+0 - .byte TEMPO , 150*se_expmax_tbs/2 - .byte VOICE , 46 - .byte VOL , 94*se_expmax_mvl/mxv - .byte BENDR , 2 - .byte LFOS , 40 - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte N06 , An5 , v112 - .byte W01 - .byte N15 , En6 , v104 - .byte W02 - .byte W01 - .byte MOD , 5 - .byte W02 - .byte W03 - .byte W03 - .byte W03 - .byte W01 - .byte 0 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_expmax_2: - .byte KEYSH , se_expmax_key+0 - .byte VOICE , 53 - .byte BENDR , 2 - .byte VOL , 43*se_expmax_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte N06 , An4 , v108 - .byte W01 - .byte N12 , Cs6 , v104 - .byte W02 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_expmax: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_expmax_pri @ Priority - .byte se_expmax_rev @ Reverb. - - .word se_expmax_grp - - .word se_expmax_1 - .word se_expmax_2 - - .end -- cgit v1.2.3 From 12ec9ec536a992e3171ce32f6f2f539169aa4d3f Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:45:34 -0400 Subject: Match se_fu_zaku.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_fu_zaku.mid | Bin 0 -> 124 bytes sound/songs/se_fu_zaku.s | 54 ---------------------------------------- 4 files changed, 4 insertions(+), 55 deletions(-) create mode 100644 sound/songs/midi/se_fu_zaku.mid delete mode 100644 sound/songs/se_fu_zaku.s diff --git a/ld_script.txt b/ld_script.txt index a2f9064cb..66081961e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -601,7 +601,7 @@ SECTIONS { sound/songs/se_jite_pyoko.o(.rodata); sound/songs/se_mu_pachi.o(.rodata); sound/songs/se_tk_kasya.o(.rodata); - sound/songs/se_fu_zaku.o(.rodata); + sound/songs/midi/se_fu_zaku.o(.rodata); sound/songs/se_fu_zaku2.o(.rodata); sound/songs/se_fu_zuzuzu.o(.rodata); sound/songs/se_ru_gashin.o(.rodata); diff --git a/songs.mk b/songs.mk index acc900b34..6430414f0 100644 --- a/songs.mk +++ b/songs.mk @@ -867,5 +867,8 @@ $(MID_SUBDIR)/se_exp.s: %.s: %.mid $(MID_SUBDIR)/se_expmax.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V094 -P5 +$(MID_SUBDIR)/se_fu_zaku.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_fu_zaku.mid b/sound/songs/midi/se_fu_zaku.mid new file mode 100644 index 000000000..dbdb6383b Binary files /dev/null and b/sound/songs/midi/se_fu_zaku.mid differ diff --git a/sound/songs/se_fu_zaku.s b/sound/songs/se_fu_zaku.s deleted file mode 100644 index b494653ee..000000000 --- a/sound/songs/se_fu_zaku.s +++ /dev/null @@ -1,54 +0,0 @@ - .include "MPlayDef.s" - - .equ se_fu_zaku_grp, voicegroup127 - .equ se_fu_zaku_pri, 4 - .equ se_fu_zaku_rev, reverb_set+50 - .equ se_fu_zaku_mvl, 127 - .equ se_fu_zaku_key, 0 - .equ se_fu_zaku_tbs, 1 - .equ se_fu_zaku_exg, 0 - .equ se_fu_zaku_cmp, 1 - - .section .rodata - .global se_fu_zaku - .align 2 - -@********************** Track 1 **********************@ - -se_fu_zaku_1: - .byte KEYSH , se_fu_zaku_key+0 - .byte TEMPO , 150*se_fu_zaku_tbs/2 - .byte VOICE , 126 - .byte VOL , 120*se_fu_zaku_mvl/mxv - .byte N01 , Cn3 , v068 - .byte W01 - .byte En3 , v064 - .byte W01 - .byte Gn3 - .byte W03 - .byte N02 , An2 , v048 - .byte W08 - .byte N01 , Cn3 , v068 - .byte W01 - .byte En3 , v064 - .byte W01 - .byte Gn3 - .byte W03 - .byte N02 , An2 , v048 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_fu_zaku: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_fu_zaku_pri @ Priority - .byte se_fu_zaku_rev @ Reverb. - - .word se_fu_zaku_grp - - .word se_fu_zaku_1 - - .end -- cgit v1.2.3 From f31e4914aa0d1a0fafa349cab365b7120b77bb78 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:47:30 -0400 Subject: Match se_fu_zaku2.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_fu_zaku2.mid | Bin 0 -> 92 bytes sound/songs/se_fu_zaku2.s | 48 --------------------------------------- 4 files changed, 4 insertions(+), 49 deletions(-) create mode 100644 sound/songs/midi/se_fu_zaku2.mid delete mode 100644 sound/songs/se_fu_zaku2.s diff --git a/ld_script.txt b/ld_script.txt index 66081961e..546d7cb2d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -602,7 +602,7 @@ SECTIONS { sound/songs/se_mu_pachi.o(.rodata); sound/songs/se_tk_kasya.o(.rodata); sound/songs/midi/se_fu_zaku.o(.rodata); - sound/songs/se_fu_zaku2.o(.rodata); + sound/songs/midi/se_fu_zaku2.o(.rodata); sound/songs/se_fu_zuzuzu.o(.rodata); sound/songs/se_ru_gashin.o(.rodata); sound/songs/se_ru_gasyan.o(.rodata); diff --git a/songs.mk b/songs.mk index 6430414f0..e604ab965 100644 --- a/songs.mk +++ b/songs.mk @@ -870,5 +870,8 @@ $(MID_SUBDIR)/se_expmax.s: %.s: %.mid $(MID_SUBDIR)/se_fu_zaku.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4 +$(MID_SUBDIR)/se_fu_zaku2.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_fu_zaku2.mid b/sound/songs/midi/se_fu_zaku2.mid new file mode 100644 index 000000000..3fc903844 Binary files /dev/null and b/sound/songs/midi/se_fu_zaku2.mid differ diff --git a/sound/songs/se_fu_zaku2.s b/sound/songs/se_fu_zaku2.s deleted file mode 100644 index 0ef523654..000000000 --- a/sound/songs/se_fu_zaku2.s +++ /dev/null @@ -1,48 +0,0 @@ - .include "MPlayDef.s" - - .equ se_fu_zaku2_grp, voicegroup127 - .equ se_fu_zaku2_pri, 4 - .equ se_fu_zaku2_rev, reverb_set+50 - .equ se_fu_zaku2_mvl, 127 - .equ se_fu_zaku2_key, 0 - .equ se_fu_zaku2_tbs, 1 - .equ se_fu_zaku2_exg, 0 - .equ se_fu_zaku2_cmp, 1 - - .section .rodata - .global se_fu_zaku2 - .align 2 - -@********************** Track 1 **********************@ - -se_fu_zaku2_1: - .byte KEYSH , se_fu_zaku2_key+0 - .byte TEMPO , 150*se_fu_zaku2_tbs/2 - .byte VOICE , 126 - .byte VOL , 110*se_fu_zaku2_mvl/mxv - .byte N01 , An2 , v112 - .byte W01 - .byte En3 - .byte W01 - .byte Gn3 - .byte W01 - .byte W02 - .byte N02 , Cn3 , v092 - .byte W01 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_fu_zaku2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_fu_zaku2_pri @ Priority - .byte se_fu_zaku2_rev @ Reverb. - - .word se_fu_zaku2_grp - - .word se_fu_zaku2_1 - - .end -- cgit v1.2.3 From 72366a320baf10820bb501733ce064a4d1a331d1 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:50:00 -0400 Subject: Match se_fu_zuzuzu.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_fu_zuzuzu.mid | Bin 0 -> 140 bytes sound/songs/se_fu_zuzuzu.s | 73 -------------------------------------- 4 files changed, 4 insertions(+), 74 deletions(-) create mode 100644 sound/songs/midi/se_fu_zuzuzu.mid delete mode 100644 sound/songs/se_fu_zuzuzu.s diff --git a/ld_script.txt b/ld_script.txt index 546d7cb2d..a28b20104 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -603,7 +603,7 @@ SECTIONS { sound/songs/se_tk_kasya.o(.rodata); sound/songs/midi/se_fu_zaku.o(.rodata); sound/songs/midi/se_fu_zaku2.o(.rodata); - sound/songs/se_fu_zuzuzu.o(.rodata); + sound/songs/midi/se_fu_zuzuzu.o(.rodata); sound/songs/se_ru_gashin.o(.rodata); sound/songs/se_ru_gasyan.o(.rodata); sound/songs/se_ru_bari.o(.rodata); diff --git a/songs.mk b/songs.mk index e604ab965..4c60a2385 100644 --- a/songs.mk +++ b/songs.mk @@ -873,5 +873,8 @@ $(MID_SUBDIR)/se_fu_zaku.s: %.s: %.mid $(MID_SUBDIR)/se_fu_zaku2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 +$(MID_SUBDIR)/se_fu_zuzuzu.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_fu_zuzuzu.mid b/sound/songs/midi/se_fu_zuzuzu.mid new file mode 100644 index 000000000..962113ad3 Binary files /dev/null and b/sound/songs/midi/se_fu_zuzuzu.mid differ diff --git a/sound/songs/se_fu_zuzuzu.s b/sound/songs/se_fu_zuzuzu.s deleted file mode 100644 index b0df814d0..000000000 --- a/sound/songs/se_fu_zuzuzu.s +++ /dev/null @@ -1,73 +0,0 @@ - .include "MPlayDef.s" - - .equ se_fu_zuzuzu_grp, voicegroup127 - .equ se_fu_zuzuzu_pri, 4 - .equ se_fu_zuzuzu_rev, reverb_set+50 - .equ se_fu_zuzuzu_mvl, 127 - .equ se_fu_zuzuzu_key, 0 - .equ se_fu_zuzuzu_tbs, 1 - .equ se_fu_zuzuzu_exg, 0 - .equ se_fu_zuzuzu_cmp, 1 - - .section .rodata - .global se_fu_zuzuzu - .align 2 - -@********************** Track 1 **********************@ - -se_fu_zuzuzu_1: - .byte KEYSH , se_fu_zuzuzu_key+0 - .byte TEMPO , 120*se_fu_zuzuzu_tbs/2 - .byte VOICE , 126 - .byte VOL , 127*se_fu_zuzuzu_mvl/mxv - .byte N08 , An2 , v112 - .byte W03 - .byte W03 - .byte W02 - .byte N01 , Gs2 - .byte W01 - .byte W01 - .byte N08 , An2 , v096 - .byte W02 - .byte W03 - .byte W03 - .byte W01 - .byte N01 , Gs2 , v092 - .byte W01 - .byte N08 , An2 , v080 - .byte W01 - .byte W03 - .byte W03 - .byte W02 - .byte N01 , Gs2 , v076 - .byte W01 - .byte N08 , An2 , v064 - .byte W03 - .byte W03 - .byte W03 - .byte N01 , Gs2 , v060 - .byte W02 - .byte N09 , An2 , v048 - .byte W01 - .byte W03 - .byte W03 - .byte W02 - .byte N01 , Gs2 , v040 - .byte W01 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_fu_zuzuzu: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_fu_zuzuzu_pri @ Priority - .byte se_fu_zuzuzu_rev @ Reverb. - - .word se_fu_zuzuzu_grp - - .word se_fu_zuzuzu_1 - - .end -- cgit v1.2.3 From 973fdffb2cc352799d15e537b3bd2fa8c12c701b Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:53:49 -0400 Subject: Match se_fuusen1.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_fuusen1.mid | Bin 0 -> 118 bytes sound/songs/se_fuusen1.s | 53 ---------------------------------------- 4 files changed, 4 insertions(+), 54 deletions(-) create mode 100644 sound/songs/midi/se_fuusen1.mid delete mode 100644 sound/songs/se_fuusen1.s diff --git a/ld_script.txt b/ld_script.txt index a28b20104..74ab2a5e5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -638,7 +638,7 @@ SECTIONS { sound/songs/se_hashi.o(.rodata); sound/songs/midi/se_daugi.o(.rodata); sound/songs/se_pinpon.o(.rodata); - sound/songs/se_fuusen1.o(.rodata); + sound/songs/midi/se_fuusen1.o(.rodata); sound/songs/se_fuusen2.o(.rodata); sound/songs/se_fuusen3.o(.rodata); sound/songs/se_toy_kabe.o(.rodata); diff --git a/songs.mk b/songs.mk index 4c60a2385..1c8597da0 100644 --- a/songs.mk +++ b/songs.mk @@ -876,5 +876,8 @@ $(MID_SUBDIR)/se_fu_zaku2.s: %.s: %.mid $(MID_SUBDIR)/se_fu_zuzuzu.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4 +$(MID_SUBDIR)/se_fuusen1.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_fuusen1.mid b/sound/songs/midi/se_fuusen1.mid new file mode 100644 index 000000000..d22679a86 Binary files /dev/null and b/sound/songs/midi/se_fuusen1.mid differ diff --git a/sound/songs/se_fuusen1.s b/sound/songs/se_fuusen1.s deleted file mode 100644 index 458b010c6..000000000 --- a/sound/songs/se_fuusen1.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_fuusen1_grp, voicegroup128 - .equ se_fuusen1_pri, 4 - .equ se_fuusen1_rev, reverb_set+50 - .equ se_fuusen1_mvl, 127 - .equ se_fuusen1_key, 0 - .equ se_fuusen1_tbs, 1 - .equ se_fuusen1_exg, 0 - .equ se_fuusen1_cmp, 1 - - .section .rodata - .global se_fuusen1 - .align 2 - -@********************** Track 1 **********************@ - -se_fuusen1_1: - .byte KEYSH , se_fuusen1_key+0 - .byte TEMPO , 240*se_fuusen1_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 105*se_fuusen1_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Cn4 , v127 - .byte W06 - .byte VOICE , 23 - .byte N02 , Cn3 , v112 - .byte W07 - .byte N01 , Cn4 - .byte W05 - .byte Cn3 , v100 - .byte W02 - .byte Gn3 , v092 - .byte W02 - .byte Cn3 , v072 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_fuusen1: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_fuusen1_pri @ Priority - .byte se_fuusen1_rev @ Reverb. - - .word se_fuusen1_grp - - .word se_fuusen1_1 - - .end -- cgit v1.2.3 From 77c2afcaa9ac40ee8cfa546d5f297429f89f5c31 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:56:10 -0400 Subject: Match se_fuusen2.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_fuusen2.mid | Bin 0 -> 110 bytes sound/songs/se_fuusen2.s | 52 ---------------------------------------- 4 files changed, 4 insertions(+), 53 deletions(-) create mode 100644 sound/songs/midi/se_fuusen2.mid delete mode 100644 sound/songs/se_fuusen2.s diff --git a/ld_script.txt b/ld_script.txt index 74ab2a5e5..23f98c8a6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -639,7 +639,7 @@ SECTIONS { sound/songs/midi/se_daugi.o(.rodata); sound/songs/se_pinpon.o(.rodata); sound/songs/midi/se_fuusen1.o(.rodata); - sound/songs/se_fuusen2.o(.rodata); + sound/songs/midi/se_fuusen2.o(.rodata); sound/songs/se_fuusen3.o(.rodata); sound/songs/se_toy_kabe.o(.rodata); sound/songs/se_toy_dango.o(.rodata); diff --git a/songs.mk b/songs.mk index 1c8597da0..09f6a5875 100644 --- a/songs.mk +++ b/songs.mk @@ -879,5 +879,8 @@ $(MID_SUBDIR)/se_fu_zuzuzu.s: %.s: %.mid $(MID_SUBDIR)/se_fuusen1.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 +$(MID_SUBDIR)/se_fuusen2.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_fuusen2.mid b/sound/songs/midi/se_fuusen2.mid new file mode 100644 index 000000000..4efc1a525 Binary files /dev/null and b/sound/songs/midi/se_fuusen2.mid differ diff --git a/sound/songs/se_fuusen2.s b/sound/songs/se_fuusen2.s deleted file mode 100644 index 065b91adf..000000000 --- a/sound/songs/se_fuusen2.s +++ /dev/null @@ -1,52 +0,0 @@ - .include "MPlayDef.s" - - .equ se_fuusen2_grp, voicegroup128 - .equ se_fuusen2_pri, 4 - .equ se_fuusen2_rev, reverb_set+50 - .equ se_fuusen2_mvl, 127 - .equ se_fuusen2_key, 0 - .equ se_fuusen2_tbs, 1 - .equ se_fuusen2_exg, 0 - .equ se_fuusen2_cmp, 1 - - .section .rodata - .global se_fuusen2 - .align 2 - -@********************** Track 1 **********************@ - -se_fuusen2_1: - .byte KEYSH , se_fuusen2_key+0 - .byte TEMPO , 240*se_fuusen2_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 105*se_fuusen2_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn4 , v127 - .byte W04 - .byte N01 , Gn4 , v112 - .byte W02 - .byte W02 - .byte Gs3 , v052 - .byte W04 - .byte VOICE , 23 - .byte N02 , Fn3 , v112 - .byte W04 - .byte N01 , Cn4 , v072 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_fuusen2: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_fuusen2_pri @ Priority - .byte se_fuusen2_rev @ Reverb. - - .word se_fuusen2_grp - - .word se_fuusen2_1 - - .end -- cgit v1.2.3 From ad717c719fa29f43c75f389abcf79ec3f1921f27 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:57:41 -0400 Subject: Match se_fuusen3.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_fuusen3.mid | Bin 0 -> 142 bytes sound/songs/se_fuusen3.s | 60 ---------------------------------------- 4 files changed, 4 insertions(+), 61 deletions(-) create mode 100644 sound/songs/midi/se_fuusen3.mid delete mode 100644 sound/songs/se_fuusen3.s diff --git a/ld_script.txt b/ld_script.txt index 23f98c8a6..c2c122a1a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -640,7 +640,7 @@ SECTIONS { sound/songs/se_pinpon.o(.rodata); sound/songs/midi/se_fuusen1.o(.rodata); sound/songs/midi/se_fuusen2.o(.rodata); - sound/songs/se_fuusen3.o(.rodata); + sound/songs/midi/se_fuusen3.o(.rodata); sound/songs/se_toy_kabe.o(.rodata); sound/songs/se_toy_dango.o(.rodata); sound/songs/midi/se_doku.o(.rodata); diff --git a/songs.mk b/songs.mk index 09f6a5875..0cbbbf098 100644 --- a/songs.mk +++ b/songs.mk @@ -882,5 +882,8 @@ $(MID_SUBDIR)/se_fuusen1.s: %.s: %.mid $(MID_SUBDIR)/se_fuusen2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 +$(MID_SUBDIR)/se_fuusen3.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_fuusen3.mid b/sound/songs/midi/se_fuusen3.mid new file mode 100644 index 000000000..ae40e0008 Binary files /dev/null and b/sound/songs/midi/se_fuusen3.mid differ diff --git a/sound/songs/se_fuusen3.s b/sound/songs/se_fuusen3.s deleted file mode 100644 index 0756c9618..000000000 --- a/sound/songs/se_fuusen3.s +++ /dev/null @@ -1,60 +0,0 @@ - .include "MPlayDef.s" - - .equ se_fuusen3_grp, voicegroup128 - .equ se_fuusen3_pri, 4 - .equ se_fuusen3_rev, reverb_set+50 - .equ se_fuusen3_mvl, 127 - .equ se_fuusen3_key, 0 - .equ se_fuusen3_tbs, 1 - .equ se_fuusen3_exg, 0 - .equ se_fuusen3_cmp, 1 - - .section .rodata - .global se_fuusen3 - .align 2 - -@********************** Track 1 **********************@ - -se_fuusen3_1: - .byte KEYSH , se_fuusen3_key+0 - .byte TEMPO , 240*se_fuusen3_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 105*se_fuusen3_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Fn3 , v127 - .byte W02 - .byte N01 , Cn4 , v112 - .byte W02 - .byte N03 , Fn3 , v052 - .byte W02 - .byte W02 - .byte VOICE , 23 - .byte N01 , En4 , v092 - .byte W01 - .byte Cn5 - .byte W03 - .byte Gn3 - .byte W01 - .byte En4 - .byte W02 - .byte En3 , v048 - .byte W01 - .byte Bn3 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_fuusen3: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_fuusen3_pri @ Priority - .byte se_fuusen3_rev @ Reverb. - - .word se_fuusen3_grp - - .word se_fuusen3_1 - - .end -- cgit v1.2.3 From 13c617cee00b56258d9395829b66cef954c054bc Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:02:20 -0400 Subject: Match se_hantei1.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/song_table.inc | 4 +-- sound/songs/midi/se_hantei1.mid | Bin 0 -> 105 bytes sound/songs/se_hantei1.s | 58 ---------------------------------------- 5 files changed, 6 insertions(+), 61 deletions(-) create mode 100644 sound/songs/midi/se_hantei1.mid delete mode 100644 sound/songs/se_hantei1.s diff --git a/ld_script.txt b/ld_script.txt index c2c122a1a..0ef95f865 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -829,7 +829,7 @@ SECTIONS { sound/songs/se_rg_nawamiss.o(.rodata); sound/songs/se_toreeye.o(.rodata); sound/songs/se_toreoff.o(.rodata); - sound/songs/se_hantei1.o(.rodata); + sound/songs/midi/se_hantei1.o(.rodata); sound/songs/se_hantei2.o(.rodata); sound/songs/midi/se_curtain.o(.rodata); sound/songs/midi/se_curtain1.o(.rodata); diff --git a/songs.mk b/songs.mk index 0cbbbf098..4724c81af 100644 --- a/songs.mk +++ b/songs.mk @@ -885,5 +885,8 @@ $(MID_SUBDIR)/se_fuusen2.s: %.s: %.mid $(MID_SUBDIR)/se_fuusen3.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 +$(MID_SUBDIR)/se_hantei1.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -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 d599ffa45..1fddaefd7 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -266,8 +266,8 @@ gSongTable:: @ 86B49F0 song se_rg_nawamiss, 1, 1 song se_toreeye, 1, 1 @ Trainer's Eye Call song se_toreoff, 1, 1 @ Trainer's Eye Hang Up - song se_hantei1, 1, 1 @ Battle Arena Time's Up 1 - song se_hantei2, 1, 1 @ Battle Arena Time's Up 2 + song se_hantei1, 1, 1 @ Battle Arena - Judgment 1 + song se_hantei2, 1, 1 @ Battle Arena - Judgment 2 song se_curtain, 1, 1 @ Battle Pike - Curtain Opens song se_curtain1, 1, 1 @ Battle Pike - Curtain Closes song se_ussoki, 1, 1 @ Sudowoodo diff --git a/sound/songs/midi/se_hantei1.mid b/sound/songs/midi/se_hantei1.mid new file mode 100644 index 000000000..1f2855420 Binary files /dev/null and b/sound/songs/midi/se_hantei1.mid differ diff --git a/sound/songs/se_hantei1.s b/sound/songs/se_hantei1.s deleted file mode 100644 index 5ef302ee6..000000000 --- a/sound/songs/se_hantei1.s +++ /dev/null @@ -1,58 +0,0 @@ - .include "MPlayDef.s" - - .equ se_hantei1_grp, voicegroup129 - .equ se_hantei1_pri, 5 - .equ se_hantei1_rev, reverb_set+50 - .equ se_hantei1_mvl, 127 - .equ se_hantei1_key, 0 - .equ se_hantei1_tbs, 1 - .equ se_hantei1_exg, 0 - .equ se_hantei1_cmp, 1 - - .section .rodata - .global se_hantei1 - .align 2 - -@********************** Track 1 **********************@ - -se_hantei1_1: - .byte KEYSH , se_hantei1_key+0 - .byte TEMPO , 92*se_hantei1_tbs/2 - .byte VOICE , 116 - .byte VOL , 127*se_hantei1_mvl/mxv - .byte PAN , c_v-62 - .byte N32 , Fn3 , v127 - .byte W12 - .byte W12 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_hantei1_2: - .byte KEYSH , se_hantei1_key+0 - .byte VOICE , 117 - .byte VOL , 127*se_hantei1_mvl/mxv - .byte PAN , c_v+63 - .byte BEND , c_v+1 - .byte N32 , An3 , v100 - .byte W12 - .byte W12 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_hantei1: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_hantei1_pri @ Priority - .byte se_hantei1_rev @ Reverb. - - .word se_hantei1_grp - - .word se_hantei1_1 - .word se_hantei1_2 - - .end -- cgit v1.2.3 From 9817919c23f0f7f576cc8f3a3a45b0246687ef01 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:03:27 -0400 Subject: Match se_hantei2.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_hantei2.mid | Bin 0 -> 143 bytes sound/songs/se_hantei2.s | 70 ---------------------------------------- 4 files changed, 4 insertions(+), 71 deletions(-) create mode 100644 sound/songs/midi/se_hantei2.mid delete mode 100644 sound/songs/se_hantei2.s diff --git a/ld_script.txt b/ld_script.txt index 0ef95f865..a62ecf6c7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -830,7 +830,7 @@ SECTIONS { sound/songs/se_toreeye.o(.rodata); sound/songs/se_toreoff.o(.rodata); sound/songs/midi/se_hantei1.o(.rodata); - sound/songs/se_hantei2.o(.rodata); + sound/songs/midi/se_hantei2.o(.rodata); sound/songs/midi/se_curtain.o(.rodata); sound/songs/midi/se_curtain1.o(.rodata); sound/songs/se_ussoki.o(.rodata); diff --git a/songs.mk b/songs.mk index 4724c81af..ee9ffe35d 100644 --- a/songs.mk +++ b/songs.mk @@ -888,5 +888,8 @@ $(MID_SUBDIR)/se_fuusen3.s: %.s: %.mid $(MID_SUBDIR)/se_hantei1.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 +$(MID_SUBDIR)/se_hantei2.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_hantei2.mid b/sound/songs/midi/se_hantei2.mid new file mode 100644 index 000000000..06698dde9 Binary files /dev/null and b/sound/songs/midi/se_hantei2.mid differ diff --git a/sound/songs/se_hantei2.s b/sound/songs/se_hantei2.s deleted file mode 100644 index a10a14f41..000000000 --- a/sound/songs/se_hantei2.s +++ /dev/null @@ -1,70 +0,0 @@ - .include "MPlayDef.s" - - .equ se_hantei2_grp, voicegroup129 - .equ se_hantei2_pri, 5 - .equ se_hantei2_rev, reverb_set+50 - .equ se_hantei2_mvl, 127 - .equ se_hantei2_key, 0 - .equ se_hantei2_tbs, 1 - .equ se_hantei2_exg, 0 - .equ se_hantei2_cmp, 1 - - .section .rodata - .global se_hantei2 - .align 2 - -@********************** Track 1 **********************@ - -se_hantei2_1: - .byte KEYSH , se_hantei2_key+0 - .byte TEMPO , 92*se_hantei2_tbs/2 - .byte VOICE , 116 - .byte VOL , 127*se_hantei2_mvl/mxv - .byte PAN , c_v-62 - .byte N04 , Fn3 , v127 - .byte W04 - .byte VOICE , 10 - .byte N04 , Cn3 - .byte W05 - .byte VOICE , 116 - .byte N32 , Fn3 - .byte W03 - .byte W12 - .byte W12 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_hantei2_2: - .byte KEYSH , se_hantei2_key+0 - .byte VOICE , 117 - .byte VOL , 127*se_hantei2_mvl/mxv - .byte PAN , c_v+63 - .byte BEND , c_v+1 - .byte N04 , Gn3 , v100 - .byte W04 - .byte Dn3 - .byte W05 - .byte N32 , Gn3 - .byte W03 - .byte W12 - .byte W12 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_hantei2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_hantei2_pri @ Priority - .byte se_hantei2_rev @ Reverb. - - .word se_hantei2_grp - - .word se_hantei2_1 - .word se_hantei2_2 - - .end -- cgit v1.2.3 From 88a4693cde13f3a9f007e8d9a08e9bb6be5536a3 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:05:36 -0400 Subject: Match se_hashi.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/song_table.inc | 2 +- sound/songs/midi/se_hashi.mid | Bin 0 -> 86 bytes sound/songs/se_hashi.s | 46 ------------------------------------------ 5 files changed, 5 insertions(+), 48 deletions(-) create mode 100644 sound/songs/midi/se_hashi.mid delete mode 100644 sound/songs/se_hashi.s diff --git a/ld_script.txt b/ld_script.txt index a62ecf6c7..7749d881a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -635,7 +635,7 @@ SECTIONS { sound/songs/se_toy_b.o(.rodata); sound/songs/se_toy_c1.o(.rodata); sound/songs/se_mizu.o(.rodata); - sound/songs/se_hashi.o(.rodata); + sound/songs/midi/se_hashi.o(.rodata); sound/songs/midi/se_daugi.o(.rodata); sound/songs/se_pinpon.o(.rodata); sound/songs/midi/se_fuusen1.o(.rodata); diff --git a/songs.mk b/songs.mk index ee9ffe35d..166e7db22 100644 --- a/songs.mk +++ b/songs.mk @@ -891,5 +891,8 @@ $(MID_SUBDIR)/se_hantei1.s: %.s: %.mid $(MID_SUBDIR)/se_hantei2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 +$(MID_SUBDIR)/se_hashi.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -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 1fddaefd7..5d71dd57f 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -72,7 +72,7 @@ gSongTable:: @ 86B49F0 song se_toy_b, 2, 2 @ Note B song se_toy_c1, 2, 2 @ Note High C song se_mizu, 2, 2 @ Puddle - song se_hashi, 2, 2 @ Boardwalk + song se_hashi, 2, 2 @ Fortree Walkways song se_daugi, 1, 1 @ Slots - Credits song se_pinpon, 1, 1 @ Ding-dong! song se_fuusen1, 2, 2 @ Red Balloon diff --git a/sound/songs/midi/se_hashi.mid b/sound/songs/midi/se_hashi.mid new file mode 100644 index 000000000..fdd772c18 Binary files /dev/null and b/sound/songs/midi/se_hashi.mid differ diff --git a/sound/songs/se_hashi.s b/sound/songs/se_hashi.s deleted file mode 100644 index ba2ed43ce..000000000 --- a/sound/songs/se_hashi.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_hashi_grp, voicegroup128 - .equ se_hashi_pri, 4 - .equ se_hashi_rev, reverb_set+50 - .equ se_hashi_mvl, 127 - .equ se_hashi_key, 0 - .equ se_hashi_tbs, 1 - .equ se_hashi_exg, 0 - .equ se_hashi_cmp, 1 - - .section .rodata - .global se_hashi - .align 2 - -@********************** Track 1 **********************@ - -se_hashi_1: - .byte KEYSH , se_hashi_key+0 - .byte TEMPO , 150*se_hashi_tbs/2 - .byte VOICE , 26 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 95*se_hashi_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn3 , v127 - .byte W03 - .byte W03 - .byte Gn3 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_hashi: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_hashi_pri @ Priority - .byte se_hashi_rev @ Reverb. - - .word se_hashi_grp - - .word se_hashi_1 - - .end -- cgit v1.2.3 From da9b55ea616961ec2e41d3d9b630e22c828f1b9f Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:07:23 -0400 Subject: Match se_hazure.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_hazure.mid | Bin 0 -> 99 bytes sound/songs/se_hazure.s | 55 ----------------------------------------- 4 files changed, 4 insertions(+), 56 deletions(-) create mode 100644 sound/songs/midi/se_hazure.mid delete mode 100644 sound/songs/se_hazure.s diff --git a/ld_script.txt b/ld_script.txt index 7749d881a..f6e3f9044 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -596,7 +596,7 @@ SECTIONS { sound/songs/se_o.o(.rodata); sound/songs/se_n.o(.rodata); sound/songs/se_seikai.o(.rodata); - sound/songs/se_hazure.o(.rodata); + sound/songs/midi/se_hazure.o(.rodata); sound/songs/midi/se_exp.o(.rodata); sound/songs/se_jite_pyoko.o(.rodata); sound/songs/se_mu_pachi.o(.rodata); diff --git a/songs.mk b/songs.mk index 166e7db22..5b7bc5a4a 100644 --- a/songs.mk +++ b/songs.mk @@ -894,5 +894,8 @@ $(MID_SUBDIR)/se_hantei2.s: %.s: %.mid $(MID_SUBDIR)/se_hashi.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 +$(MID_SUBDIR)/se_hazure.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_hazure.mid b/sound/songs/midi/se_hazure.mid new file mode 100644 index 000000000..c3c52f88f Binary files /dev/null and b/sound/songs/midi/se_hazure.mid differ diff --git a/sound/songs/se_hazure.s b/sound/songs/se_hazure.s deleted file mode 100644 index 9bd29f6b5..000000000 --- a/sound/songs/se_hazure.s +++ /dev/null @@ -1,55 +0,0 @@ - .include "MPlayDef.s" - - .equ se_hazure_grp, voicegroup127 - .equ se_hazure_pri, 4 - .equ se_hazure_rev, reverb_set+50 - .equ se_hazure_mvl, 127 - .equ se_hazure_key, 0 - .equ se_hazure_tbs, 1 - .equ se_hazure_exg, 0 - .equ se_hazure_cmp, 1 - - .section .rodata - .global se_hazure - .align 2 - -@********************** Track 1 **********************@ - -se_hazure_1: - .byte KEYSH , se_hazure_key+0 - .byte TEMPO , 240*se_hazure_tbs/2 - .byte VOICE , 92 - .byte BENDR , 12 - .byte VOL , 120*se_hazure_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Cn2 , v127 - .byte W03 - .byte Cn2 , v020 - .byte W03 - .byte N18 , Cn2 , v127 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte N09 , Cn2 , v020 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_hazure: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_hazure_pri @ Priority - .byte se_hazure_rev @ Reverb. - - .word se_hazure_grp - - .word se_hazure_1 - - .end -- cgit v1.2.3 From 937e9d05e8fa19237cbd4c7dbf59d2fa52269d7d Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:09:46 -0400 Subject: Match se_hi_turun.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/song_table.inc | 4 +-- sound/songs/midi/se_hi_turun.mid | Bin 0 -> 132 bytes sound/songs/se_hi_turun.s | 62 --------------------------------------- 5 files changed, 6 insertions(+), 65 deletions(-) create mode 100644 sound/songs/midi/se_hi_turun.mid delete mode 100644 sound/songs/se_hi_turun.s diff --git a/ld_script.txt b/ld_script.txt index f6e3f9044..992cba967 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -612,7 +612,7 @@ SECTIONS { sound/songs/se_tk_warpin.o(.rodata); sound/songs/se_tk_warpout.o(.rodata); sound/songs/se_tu_saa.o(.rodata); - sound/songs/se_hi_turun.o(.rodata); + sound/songs/midi/se_hi_turun.o(.rodata); sound/songs/se_track_move.o(.rodata); sound/songs/se_track_stop.o(.rodata); sound/songs/se_track_haiki.o(.rodata); diff --git a/songs.mk b/songs.mk index 5b7bc5a4a..873657dca 100644 --- a/songs.mk +++ b/songs.mk @@ -897,5 +897,8 @@ $(MID_SUBDIR)/se_hashi.s: %.s: %.mid $(MID_SUBDIR)/se_hazure.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4 +$(MID_SUBDIR)/se_hi_turun.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -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 5d71dd57f..1ba64a712 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -40,7 +40,7 @@ gSongTable:: @ 86B49F0 song se_tk_kasya, 1, 1 @ Mossdeep Gym/Trick House Switch song se_fu_zaku, 1, 1 song se_fu_zaku2, 1, 1 - song se_fu_zuzuzu, 1, 1 @ Lavaridge Gym Warp + song se_fu_zuzuzu, 1, 1 @ Lavaridge Gym - Warp 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 @@ -49,7 +49,7 @@ gSongTable:: @ 86B49F0 song se_tk_warpin, 1, 1 @ Warp In song se_tk_warpout, 1, 1 @ Warp Out song se_tu_saa, 1, 1 @ Repel - song se_hi_turun, 1, 1 @ Moving Obstacle in Fortree Gym + song se_hi_turun, 1, 1 @ Fortree Gym - Obstacle song se_track_move, 1, 1 @ Moving Truck song se_track_stop, 1, 1 @ Moving Truck Stop song se_track_haiki, 2, 2 @ Moving Truck Unload diff --git a/sound/songs/midi/se_hi_turun.mid b/sound/songs/midi/se_hi_turun.mid new file mode 100644 index 000000000..2a09f6c55 Binary files /dev/null and b/sound/songs/midi/se_hi_turun.mid differ diff --git a/sound/songs/se_hi_turun.s b/sound/songs/se_hi_turun.s deleted file mode 100644 index ab51f35cd..000000000 --- a/sound/songs/se_hi_turun.s +++ /dev/null @@ -1,62 +0,0 @@ - .include "MPlayDef.s" - - .equ se_hi_turun_grp, voicegroup128 - .equ se_hi_turun_pri, 4 - .equ se_hi_turun_rev, reverb_set+50 - .equ se_hi_turun_mvl, 127 - .equ se_hi_turun_key, 0 - .equ se_hi_turun_tbs, 1 - .equ se_hi_turun_exg, 0 - .equ se_hi_turun_cmp, 1 - - .section .rodata - .global se_hi_turun - .align 2 - -@********************** Track 1 **********************@ - -se_hi_turun_1: - .byte KEYSH , se_hi_turun_key+0 - .byte TEMPO , 220*se_hi_turun_tbs/2 - .byte VOICE , 9 - .byte VOL , 90*se_hi_turun_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn4 , v112 - .byte W03 - .byte Dn4 - .byte W03 - .byte Gn4 - .byte W03 - .byte N21 , Gn5 - .byte W03 - .byte W03 - .byte VOL , 81*se_hi_turun_mvl/mxv - .byte BEND , c_v+6 - .byte W03 - .byte VOL , 72*se_hi_turun_mvl/mxv - .byte BEND , c_v+20 - .byte W03 - .byte VOL , 46*se_hi_turun_mvl/mxv - .byte BEND , c_v+37 - .byte W03 - .byte VOL , 24*se_hi_turun_mvl/mxv - .byte BEND , c_v+63 - .byte W03 - .byte VOL , 7*se_hi_turun_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_hi_turun: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_hi_turun_pri @ Priority - .byte se_hi_turun_rev @ Reverb. - - .word se_hi_turun_grp - - .word se_hi_turun_1 - - .end -- cgit v1.2.3 From ab5c24daa6a5190f9caf470ea6043c0a35c92ce6 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:11:23 -0400 Subject: Match se_hinsi.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_hinsi.mid | Bin 0 -> 106 bytes sound/songs/se_hinsi.s | 50 ------------------------------------------ 4 files changed, 4 insertions(+), 51 deletions(-) create mode 100644 sound/songs/midi/se_hinsi.mid delete mode 100644 sound/songs/se_hinsi.s diff --git a/ld_script.txt b/ld_script.txt index 992cba967..8346c6ce9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -654,7 +654,7 @@ SECTIONS { sound/songs/se_t_kami.o(.rodata); sound/songs/se_t_kami2.o(.rodata); sound/songs/midi/se_elebeta.o(.rodata); - sound/songs/se_hinsi.o(.rodata); + sound/songs/midi/se_hinsi.o(.rodata); sound/songs/midi/se_expmax.o(.rodata); sound/songs/se_tamakoro.o(.rodata); sound/songs/se_tamakoro_e.o(.rodata); diff --git a/songs.mk b/songs.mk index 873657dca..ecd18722f 100644 --- a/songs.mk +++ b/songs.mk @@ -900,5 +900,8 @@ $(MID_SUBDIR)/se_hazure.s: %.s: %.mid $(MID_SUBDIR)/se_hi_turun.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 +$(MID_SUBDIR)/se_hinsi.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P3 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_hinsi.mid b/sound/songs/midi/se_hinsi.mid new file mode 100644 index 000000000..3676a4a04 Binary files /dev/null and b/sound/songs/midi/se_hinsi.mid differ diff --git a/sound/songs/se_hinsi.s b/sound/songs/se_hinsi.s deleted file mode 100644 index 3c16f2f1b..000000000 --- a/sound/songs/se_hinsi.s +++ /dev/null @@ -1,50 +0,0 @@ - .include "MPlayDef.s" - - .equ se_hinsi_grp, voicegroup127 - .equ se_hinsi_pri, 3 - .equ se_hinsi_rev, reverb_set+50 - .equ se_hinsi_mvl, 127 - .equ se_hinsi_key, 0 - .equ se_hinsi_tbs, 1 - .equ se_hinsi_exg, 0 - .equ se_hinsi_cmp, 1 - - .section .rodata - .global se_hinsi - .align 2 - -@********************** Track 1 **********************@ - -se_hinsi_1: - .byte KEYSH , se_hinsi_key+0 -se_hinsi_1_B1: - .byte TEMPO , 150*se_hinsi_tbs/2 - .byte VOICE , 15 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 100*se_hinsi_mvl/mxv - .byte BEND , c_v+17 - .byte N12 , Dn4 , v080 - .byte W12 - .byte BEND , c_v+31 - .byte N12 , An3 - .byte W12 - .byte W12 - .byte GOTO - .word se_hinsi_1_B1 - .byte FINE - -@******************************************************@ - .align 2 - -se_hinsi: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_hinsi_pri @ Priority - .byte se_hinsi_rev @ Reverb. - - .word se_hinsi_grp - - .word se_hinsi_1 - - .end -- cgit v1.2.3 From 27f2b3b00ab6cda07d6a5033ae21e44fde15e78b Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:15:30 -0400 Subject: Match se_i.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_i.mid | Bin 0 -> 75 bytes sound/songs/se_i.s | 45 --------------------------------------------- 4 files changed, 4 insertions(+), 46 deletions(-) create mode 100644 sound/songs/midi/se_i.mid delete mode 100644 sound/songs/se_i.s diff --git a/ld_script.txt b/ld_script.txt index 8346c6ce9..7722ba540 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -590,7 +590,7 @@ SECTIONS { sound/songs/midi/se_bowa.o(.rodata); sound/songs/se_jyuni.o(.rodata); sound/songs/midi/se_a.o(.rodata); - sound/songs/se_i.o(.rodata); + sound/songs/midi/se_i.o(.rodata); sound/songs/se_u.o(.rodata); sound/songs/midi/se_e.o(.rodata); sound/songs/se_o.o(.rodata); diff --git a/songs.mk b/songs.mk index ecd18722f..c7bea07de 100644 --- a/songs.mk +++ b/songs.mk @@ -903,5 +903,8 @@ $(MID_SUBDIR)/se_hi_turun.s: %.s: %.mid $(MID_SUBDIR)/se_hinsi.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P3 +$(MID_SUBDIR)/se_i.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_i.mid b/sound/songs/midi/se_i.mid new file mode 100644 index 000000000..df7278dfd Binary files /dev/null and b/sound/songs/midi/se_i.mid differ diff --git a/sound/songs/se_i.s b/sound/songs/se_i.s deleted file mode 100644 index fdb4ff5c4..000000000 --- a/sound/songs/se_i.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_i_grp, voicegroup128 - .equ se_i_pri, 4 - .equ se_i_rev, reverb_set+50 - .equ se_i_mvl, 127 - .equ se_i_key, 0 - .equ se_i_tbs, 1 - .equ se_i_exg, 0 - .equ se_i_cmp, 1 - - .section .rodata - .global se_i - .align 2 - -@********************** Track 1 **********************@ - -se_i_1: - .byte KEYSH , se_i_key+0 - .byte TEMPO , 240*se_i_tbs/2 - .byte VOICE , 123 - .byte BENDR , 12 - .byte VOL , 120*se_i_mvl/mxv - .byte BEND , c_v+0 - .byte N72 , Cn3 , v127 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_i: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_i_pri @ Priority - .byte se_i_rev @ Reverb. - - .word se_i_grp - - .word se_i_1 - - .end -- cgit v1.2.3 From 2f21d2e9aba36fc762c81187790e731ed6031079 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:17:07 -0400 Subject: Match se_jido_doa.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_jido_doa.mid | Bin 0 -> 72 bytes sound/songs/se_jido_doa.s | 41 --------------------------------------- 4 files changed, 4 insertions(+), 42 deletions(-) create mode 100644 sound/songs/midi/se_jido_doa.mid delete mode 100644 sound/songs/se_jido_doa.s diff --git a/ld_script.txt b/ld_script.txt index 7722ba540..8d5181259 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -582,7 +582,7 @@ SECTIONS { sound/songs/midi/se_bowa2.o(.rodata); sound/songs/se_poke_dead.o(.rodata); sound/songs/se_nigeru.o(.rodata); - sound/songs/se_jido_doa.o(.rodata); + sound/songs/midi/se_jido_doa.o(.rodata); sound/songs/se_naminori.o(.rodata); sound/songs/midi/se_ban.o(.rodata); sound/songs/se_pin.o(.rodata); diff --git a/songs.mk b/songs.mk index c7bea07de..9e796c83d 100644 --- a/songs.mk +++ b/songs.mk @@ -906,5 +906,8 @@ $(MID_SUBDIR)/se_hinsi.s: %.s: %.mid $(MID_SUBDIR)/se_i.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 +$(MID_SUBDIR)/se_jido_doa.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_jido_doa.mid b/sound/songs/midi/se_jido_doa.mid new file mode 100644 index 000000000..62fa8c911 Binary files /dev/null and b/sound/songs/midi/se_jido_doa.mid differ diff --git a/sound/songs/se_jido_doa.s b/sound/songs/se_jido_doa.s deleted file mode 100644 index 60a1e4a47..000000000 --- a/sound/songs/se_jido_doa.s +++ /dev/null @@ -1,41 +0,0 @@ - .include "MPlayDef.s" - - .equ se_jido_doa_grp, voicegroup128 - .equ se_jido_doa_pri, 4 - .equ se_jido_doa_rev, reverb_set+50 - .equ se_jido_doa_mvl, 127 - .equ se_jido_doa_key, 0 - .equ se_jido_doa_tbs, 1 - .equ se_jido_doa_exg, 0 - .equ se_jido_doa_cmp, 1 - - .section .rodata - .global se_jido_doa - .align 2 - -@********************** Track 1 **********************@ - -se_jido_doa_1: - .byte KEYSH , se_jido_doa_key+0 - .byte TEMPO , 120*se_jido_doa_tbs/2 - .byte VOICE , 1 - .byte VOL , 95*se_jido_doa_mvl/mxv - .byte N12 , Cn2 , v127 - .byte W12 - .byte VOL , 0*se_jido_doa_mvl/mxv - .byte FINE - -@******************************************************@ - .align 2 - -se_jido_doa: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_jido_doa_pri @ Priority - .byte se_jido_doa_rev @ Reverb. - - .word se_jido_doa_grp - - .word se_jido_doa_1 - - .end -- cgit v1.2.3 From 471aa8eeaca130668655623be332d54051c7335c Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:18:51 -0400 Subject: Match se_jihanki.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_jihanki.mid | Bin 0 -> 88 bytes sound/songs/se_jihanki.s | 46 ---------------------------------------- 4 files changed, 4 insertions(+), 47 deletions(-) create mode 100644 sound/songs/midi/se_jihanki.mid delete mode 100644 sound/songs/se_jihanki.s diff --git a/ld_script.txt b/ld_script.txt index 8d5181259..d67a65052 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -670,7 +670,7 @@ SECTIONS { sound/songs/se_op_basyu.o(.rodata); sound/songs/midi/se_bt_start.o(.rodata); sound/songs/midi/se_dendou.o(.rodata); - sound/songs/se_jihanki.o(.rodata); + sound/songs/midi/se_jihanki.o(.rodata); sound/songs/se_tama.o(.rodata); sound/songs/se_z_scroll.o(.rodata); sound/songs/se_z_page.o(.rodata); diff --git a/songs.mk b/songs.mk index 9e796c83d..437a22857 100644 --- a/songs.mk +++ b/songs.mk @@ -909,5 +909,8 @@ $(MID_SUBDIR)/se_i.s: %.s: %.mid $(MID_SUBDIR)/se_jido_doa.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 +$(MID_SUBDIR)/se_jihanki.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/songs/midi/se_jihanki.mid b/sound/songs/midi/se_jihanki.mid new file mode 100644 index 000000000..ac6436d72 Binary files /dev/null and b/sound/songs/midi/se_jihanki.mid differ diff --git a/sound/songs/se_jihanki.s b/sound/songs/se_jihanki.s deleted file mode 100644 index 931dd5b64..000000000 --- a/sound/songs/se_jihanki.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_jihanki_grp, voicegroup128 - .equ se_jihanki_pri, 4 - .equ se_jihanki_rev, reverb_set+50 - .equ se_jihanki_mvl, 127 - .equ se_jihanki_key, 0 - .equ se_jihanki_tbs, 1 - .equ se_jihanki_exg, 0 - .equ se_jihanki_cmp, 1 - - .section .rodata - .global se_jihanki - .align 2 - -@********************** Track 1 **********************@ - -se_jihanki_1: - .byte KEYSH , se_jihanki_key+0 - .byte TEMPO , 150*se_jihanki_tbs/2 - .byte VOICE , 8 - .byte VOL , 110*se_jihanki_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn4 , v092 - .byte W03 - .byte Cn5 - .byte W03 - .byte W03 - .byte N02 , En3 , v127 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_jihanki: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_jihanki_pri @ Priority - .byte se_jihanki_rev @ Reverb. - - .word se_jihanki_grp - - .word se_jihanki_1 - - .end -- cgit v1.2.3 From 2f10c5c24c306ea9bf1c212190375f9f05b170db Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:20:54 -0400 Subject: Match se_jite_pyoko.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_jite_pyoko.mid | Bin 0 -> 83 bytes sound/songs/se_jite_pyoko.s | 45 ------------------------------------- 4 files changed, 4 insertions(+), 46 deletions(-) create mode 100644 sound/songs/midi/se_jite_pyoko.mid delete mode 100644 sound/songs/se_jite_pyoko.s diff --git a/ld_script.txt b/ld_script.txt index d67a65052..763d4ba4c 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -598,7 +598,7 @@ SECTIONS { sound/songs/se_seikai.o(.rodata); sound/songs/midi/se_hazure.o(.rodata); sound/songs/midi/se_exp.o(.rodata); - sound/songs/se_jite_pyoko.o(.rodata); + sound/songs/midi/se_jite_pyoko.o(.rodata); sound/songs/se_mu_pachi.o(.rodata); sound/songs/se_tk_kasya.o(.rodata); sound/songs/midi/se_fu_zaku.o(.rodata); diff --git a/songs.mk b/songs.mk index 437a22857..c4f5a50d8 100644 --- a/songs.mk +++ b/songs.mk @@ -912,5 +912,8 @@ $(MID_SUBDIR)/se_jido_doa.s: %.s: %.mid $(MID_SUBDIR)/se_jihanki.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_jite_pyoko.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_jite_pyoko.mid b/sound/songs/midi/se_jite_pyoko.mid new file mode 100644 index 000000000..013be8590 Binary files /dev/null and b/sound/songs/midi/se_jite_pyoko.mid differ diff --git a/sound/songs/se_jite_pyoko.s b/sound/songs/se_jite_pyoko.s deleted file mode 100644 index 36dbcf83b..000000000 --- a/sound/songs/se_jite_pyoko.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_jite_pyoko_grp, voicegroup127 - .equ se_jite_pyoko_pri, 4 - .equ se_jite_pyoko_rev, reverb_set+50 - .equ se_jite_pyoko_mvl, 127 - .equ se_jite_pyoko_key, 0 - .equ se_jite_pyoko_tbs, 1 - .equ se_jite_pyoko_exg, 0 - .equ se_jite_pyoko_cmp, 1 - - .section .rodata - .global se_jite_pyoko - .align 2 - -@********************** Track 1 **********************@ - -se_jite_pyoko_1: - .byte KEYSH , se_jite_pyoko_key+0 - .byte TEMPO , 180*se_jite_pyoko_tbs/2 - .byte VOICE , 85 - .byte VOL , 90*se_jite_pyoko_mvl/mxv - .byte BEND , c_v-6 - .byte N02 , Cn3 , v080 - .byte W02 - .byte VOICE , 86 - .byte N03 , Cn4 , v127 - .byte W01 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_jite_pyoko: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_jite_pyoko_pri @ Priority - .byte se_jite_pyoko_rev @ Reverb. - - .word se_jite_pyoko_grp - - .word se_jite_pyoko_1 - - .end -- cgit v1.2.3 From 395e754760b9a60718e80bfabc2071ce460fdc39 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:22:40 -0400 Subject: Match se_jitensya.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_jitensya.mid | Bin 0 -> 68 bytes sound/songs/se_jitensya.s | 40 --------------------------------------- 4 files changed, 4 insertions(+), 41 deletions(-) create mode 100644 sound/songs/midi/se_jitensya.mid delete mode 100644 sound/songs/se_jitensya.s diff --git a/ld_script.txt b/ld_script.txt index 763d4ba4c..436c717ae 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -575,7 +575,7 @@ SECTIONS { sound/songs/midi/se_door.o(.rodata); sound/songs/se_kaidan.o(.rodata); sound/songs/midi/se_dansa.o(.rodata); - sound/songs/se_jitensya.o(.rodata); + sound/songs/midi/se_jitensya.o(.rodata); sound/songs/se_kouka_l.o(.rodata); sound/songs/se_kouka_m.o(.rodata); sound/songs/se_kouka_h.o(.rodata); diff --git a/songs.mk b/songs.mk index c4f5a50d8..647a30595 100644 --- a/songs.mk +++ b/songs.mk @@ -915,5 +915,8 @@ $(MID_SUBDIR)/se_jihanki.s: %.s: %.mid $(MID_SUBDIR)/se_jite_pyoko.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 +$(MID_SUBDIR)/se_jitensya.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_jitensya.mid b/sound/songs/midi/se_jitensya.mid new file mode 100644 index 000000000..9d5de6cbd Binary files /dev/null and b/sound/songs/midi/se_jitensya.mid differ diff --git a/sound/songs/se_jitensya.s b/sound/songs/se_jitensya.s deleted file mode 100644 index da5d37007..000000000 --- a/sound/songs/se_jitensya.s +++ /dev/null @@ -1,40 +0,0 @@ - .include "MPlayDef.s" - - .equ se_jitensya_grp, voicegroup128 - .equ se_jitensya_pri, 4 - .equ se_jitensya_rev, reverb_set+50 - .equ se_jitensya_mvl, 127 - .equ se_jitensya_key, 0 - .equ se_jitensya_tbs, 1 - .equ se_jitensya_exg, 0 - .equ se_jitensya_cmp, 1 - - .section .rodata - .global se_jitensya - .align 2 - -@********************** Track 1 **********************@ - -se_jitensya_1: - .byte KEYSH , se_jitensya_key+0 - .byte TEMPO , 120*se_jitensya_tbs/2 - .byte VOICE , 0 - .byte VOL , 90*se_jitensya_mvl/mxv - .byte N96 , Cn3 , v127 - .byte W96 - .byte FINE - -@******************************************************@ - .align 2 - -se_jitensya: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_jitensya_pri @ Priority - .byte se_jitensya_rev @ Reverb. - - .word se_jitensya_grp - - .word se_jitensya_1 - - .end -- cgit v1.2.3 From 1aae1c19ea293a280527315840c87081bd10e6d0 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:27:34 -0400 Subject: Match se_jyuni.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/se_jyuni.mid | Bin 0 -> 267 bytes sound/songs/se_jyuni.s | 127 ------------------------------------------ 5 files changed, 5 insertions(+), 129 deletions(-) create mode 100644 sound/songs/midi/se_jyuni.mid delete mode 100644 sound/songs/se_jyuni.s diff --git a/ld_script.txt b/ld_script.txt index 436c717ae..1c1ff43ea 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -588,7 +588,7 @@ SECTIONS { sound/songs/se_pin.o(.rodata); sound/songs/midi/se_boo.o(.rodata); sound/songs/midi/se_bowa.o(.rodata); - sound/songs/se_jyuni.o(.rodata); + sound/songs/midi/se_jyuni.o(.rodata); sound/songs/midi/se_a.o(.rodata); sound/songs/midi/se_i.o(.rodata); sound/songs/se_u.o(.rodata); diff --git a/songs.mk b/songs.mk index 647a30595..4f9d1415d 100644 --- a/songs.mk +++ b/songs.mk @@ -918,5 +918,8 @@ $(MID_SUBDIR)/se_jite_pyoko.s: %.s: %.mid $(MID_SUBDIR)/se_jitensya.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 +$(MID_SUBDIR)/se_jyuni.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -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 1ba64a712..5b5813ab2 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -25,7 +25,7 @@ gSongTable:: @ 86B49F0 song se_pin, 1, 1 @ Exclamation Bubble song se_boo, 1, 1 @ Contest Jam song se_bowa, 1, 1 @ Giving Poké Ball to Nurse, Poké Ball Wiggle - song se_jyuni, 2, 2 @ Places in Contest Appearing + song se_jyuni, 2, 2 @ Contest - Rankings Revealed song se_a, 1, 1 @ Bard A song se_i, 1, 1 @ Bard I song se_u, 1, 1 @ Bard U diff --git a/sound/songs/midi/se_jyuni.mid b/sound/songs/midi/se_jyuni.mid new file mode 100644 index 000000000..f68a31e46 Binary files /dev/null and b/sound/songs/midi/se_jyuni.mid differ diff --git a/sound/songs/se_jyuni.s b/sound/songs/se_jyuni.s deleted file mode 100644 index 1267e7f35..000000000 --- a/sound/songs/se_jyuni.s +++ /dev/null @@ -1,127 +0,0 @@ - .include "MPlayDef.s" - - .equ se_jyuni_grp, voicegroup127 - .equ se_jyuni_pri, 4 - .equ se_jyuni_rev, reverb_set+50 - .equ se_jyuni_mvl, 127 - .equ se_jyuni_key, 0 - .equ se_jyuni_tbs, 1 - .equ se_jyuni_exg, 0 - .equ se_jyuni_cmp, 1 - - .section .rodata - .global se_jyuni - .align 2 - -@********************** Track 1 **********************@ - -se_jyuni_1: - .byte KEYSH , se_jyuni_key+0 - .byte TEMPO , 144*se_jyuni_tbs/2 - .byte VOICE , 48 - .byte PAN , c_v+1 - .byte VOL , 110*se_jyuni_mvl/mxv - .byte N06 , Cn3 , v060 - .byte W06 - .byte N13 , Gn3 - .byte W06 - .byte W01 - .byte VOL , 105*se_jyuni_mvl/mxv - .byte W01 - .byte 100*se_jyuni_mvl/mxv - .byte W01 - .byte 89*se_jyuni_mvl/mxv - .byte W01 - .byte 72*se_jyuni_mvl/mxv - .byte W02 - .byte 55*se_jyuni_mvl/mxv - .byte W01 - .byte 38*se_jyuni_mvl/mxv - .byte W01 - .byte 22*se_jyuni_mvl/mxv - .byte W01 - .byte 110*se_jyuni_mvl/mxv - .byte N12 , Gn3 , v032 - .byte W03 - .byte W01 - .byte VOL , 100*se_jyuni_mvl/mxv - .byte W01 - .byte 91*se_jyuni_mvl/mxv - .byte W01 - .byte 75*se_jyuni_mvl/mxv - .byte W01 - .byte 43*se_jyuni_mvl/mxv - .byte W02 - .byte 24*se_jyuni_mvl/mxv - .byte W01 - .byte 9*se_jyuni_mvl/mxv - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_jyuni_2: - .byte KEYSH , se_jyuni_key+0 - .byte VOICE , 80 - .byte VOL , 110*se_jyuni_mvl/mxv - .byte PAN , c_v+0 - .byte N06 , Cn3 , v060 - .byte W06 - .byte N13 , Gn3 - .byte W06 - .byte W09 - .byte PAN , c_v-48 - .byte N12 , Gn3 , v032 - .byte W03 - .byte W12 - .byte FINE - -@********************** Track 3 **********************@ - -se_jyuni_3: - .byte KEYSH , se_jyuni_key+0 - .byte VOICE , 81 - .byte VOL , 110*se_jyuni_mvl/mxv - .byte PAN , c_v+0 - .byte N06 , Gn2 , v060 - .byte W06 - .byte N13 , Cn3 - .byte W06 - .byte W09 - .byte PAN , c_v+48 - .byte N12 , Cn3 , v032 - .byte W03 - .byte W12 - .byte FINE - -@********************** Track 4 **********************@ - -se_jyuni_4: - .byte KEYSH , se_jyuni_key+0 - .byte VOICE , 47 - .byte VOL , 110*se_jyuni_mvl/mxv - .byte N06 , Gn1 , v127 - .byte W06 - .byte N13 , Cn2 - .byte W06 - .byte W12 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_jyuni: - .byte 4 @ NumTrks - .byte 0 @ NumBlks - .byte se_jyuni_pri @ Priority - .byte se_jyuni_rev @ Reverb. - - .word se_jyuni_grp - - .word se_jyuni_1 - .word se_jyuni_2 - .word se_jyuni_3 - .word se_jyuni_4 - - .end -- cgit v1.2.3 From 76e3091d6de18ce8a96ead0c34c83316b5dc3daa Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:29:16 -0400 Subject: Match se_kaidan.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_kaidan.mid | Bin 0 -> 124 bytes sound/songs/se_kaidan.s | 61 ----------------------------------------- 4 files changed, 4 insertions(+), 62 deletions(-) create mode 100644 sound/songs/midi/se_kaidan.mid delete mode 100644 sound/songs/se_kaidan.s diff --git a/ld_script.txt b/ld_script.txt index 1c1ff43ea..16596f7ac 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -573,7 +573,7 @@ SECTIONS { sound/songs/se_win_open.o(.rodata); sound/songs/se_wall_hit.o(.rodata); sound/songs/midi/se_door.o(.rodata); - sound/songs/se_kaidan.o(.rodata); + sound/songs/midi/se_kaidan.o(.rodata); sound/songs/midi/se_dansa.o(.rodata); sound/songs/midi/se_jitensya.o(.rodata); sound/songs/se_kouka_l.o(.rodata); diff --git a/songs.mk b/songs.mk index 4f9d1415d..4e9ad717a 100644 --- a/songs.mk +++ b/songs.mk @@ -921,5 +921,8 @@ $(MID_SUBDIR)/se_jitensya.s: %.s: %.mid $(MID_SUBDIR)/se_jyuni.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 +$(MID_SUBDIR)/se_kaidan.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_kaidan.mid b/sound/songs/midi/se_kaidan.mid new file mode 100644 index 000000000..575307d86 Binary files /dev/null and b/sound/songs/midi/se_kaidan.mid differ diff --git a/sound/songs/se_kaidan.s b/sound/songs/se_kaidan.s deleted file mode 100644 index 3563c4062..000000000 --- a/sound/songs/se_kaidan.s +++ /dev/null @@ -1,61 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kaidan_grp, voicegroup127 - .equ se_kaidan_pri, 5 - .equ se_kaidan_rev, reverb_set+50 - .equ se_kaidan_mvl, 127 - .equ se_kaidan_key, 0 - .equ se_kaidan_tbs, 1 - .equ se_kaidan_exg, 0 - .equ se_kaidan_cmp, 1 - - .section .rodata - .global se_kaidan - .align 2 - -@********************** Track 1 **********************@ - -se_kaidan_1: - .byte KEYSH , se_kaidan_key+0 - .byte TEMPO , 120*se_kaidan_tbs/2 - .byte VOICE , 126 - .byte VOL , 120*se_kaidan_mvl/mxv - .byte N02 , An2 , v068 - .byte W02 - .byte Cn3 , v127 - .byte W01 - .byte W01 - .byte En4 , v068 - .byte W02 - .byte W03 - .byte W03 - .byte An2 - .byte W02 - .byte Cn3 , v100 - .byte W01 - .byte W01 - .byte En4 , v068 - .byte W02 - .byte W03 - .byte W03 - .byte An2 , v032 - .byte W02 - .byte Cn3 , v052 - .byte W01 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_kaidan: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_kaidan_pri @ Priority - .byte se_kaidan_rev @ Reverb. - - .word se_kaidan_grp - - .word se_kaidan_1 - - .end -- cgit v1.2.3 From dac1ddba490845be9949f786ecebe17ecbbd169d Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:35:12 -0400 Subject: Match se_kaifuku.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_kaifuku.mid | Bin 0 -> 91 bytes sound/songs/se_kaifuku.s | 46 ---------------------------------------- 4 files changed, 4 insertions(+), 47 deletions(-) create mode 100644 sound/songs/midi/se_kaifuku.mid delete mode 100644 sound/songs/se_kaifuku.s diff --git a/ld_script.txt b/ld_script.txt index 16596f7ac..138590628 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -565,7 +565,7 @@ SECTIONS { ALIGN(4) { sound/songs/midi/mus_dummy.o(.rodata); - sound/songs/se_kaifuku.o(.rodata); + sound/songs/midi/se_kaifuku.o(.rodata); sound/songs/se_pc_login.o(.rodata); sound/songs/se_pc_off.o(.rodata); sound/songs/se_pc_on.o(.rodata); diff --git a/songs.mk b/songs.mk index 4e9ad717a..fdeaf431f 100644 --- a/songs.mk +++ b/songs.mk @@ -924,5 +924,8 @@ $(MID_SUBDIR)/se_jyuni.s: %.s: %.mid $(MID_SUBDIR)/se_kaidan.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P5 +$(MID_SUBDIR)/se_kaifuku.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/songs/midi/se_kaifuku.mid b/sound/songs/midi/se_kaifuku.mid new file mode 100644 index 000000000..4375a705d Binary files /dev/null and b/sound/songs/midi/se_kaifuku.mid differ diff --git a/sound/songs/se_kaifuku.s b/sound/songs/se_kaifuku.s deleted file mode 100644 index ecaf63c92..000000000 --- a/sound/songs/se_kaifuku.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kaifuku_grp, voicegroup127 - .equ se_kaifuku_pri, 5 - .equ se_kaifuku_rev, reverb_set+50 - .equ se_kaifuku_mvl, 127 - .equ se_kaifuku_key, 0 - .equ se_kaifuku_tbs, 1 - .equ se_kaifuku_exg, 0 - .equ se_kaifuku_cmp, 1 - - .section .rodata - .global se_kaifuku - .align 2 - -@********************** Track 1 **********************@ - -se_kaifuku_1: - .byte KEYSH , se_kaifuku_key+0 - .byte TEMPO , 132*se_kaifuku_tbs/2 - .byte VOICE , 91 - .byte VOL , 100*se_kaifuku_mvl/mxv - .byte BEND , c_v-6 - .byte N02 , Cn3 , v112 - .byte W04 - .byte N02 - .byte W04 - .byte VOICE , 90 - .byte N15 - .byte W16 - .byte FINE - -@******************************************************@ - .align 2 - -se_kaifuku: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_kaifuku_pri @ Priority - .byte se_kaifuku_rev @ Reverb. - - .word se_kaifuku_grp - - .word se_kaifuku_1 - - .end -- cgit v1.2.3 From f471165e6cb151f7b0e0f581a492e3cf553e1cfb Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:37:38 -0400 Subject: Match se_ki_gasyan.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_ki_gasyan.mid | Bin 0 -> 152 bytes sound/songs/se_ki_gasyan.s | 76 -------------------------------------- 4 files changed, 4 insertions(+), 77 deletions(-) create mode 100644 sound/songs/midi/se_ki_gasyan.mid delete mode 100644 sound/songs/se_ki_gasyan.s diff --git a/ld_script.txt b/ld_script.txt index 138590628..d537dceac 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -608,7 +608,7 @@ SECTIONS { sound/songs/se_ru_gasyan.o(.rodata); sound/songs/se_ru_bari.o(.rodata); sound/songs/se_ru_hyuu.o(.rodata); - sound/songs/se_ki_gasyan.o(.rodata); + sound/songs/midi/se_ki_gasyan.o(.rodata); sound/songs/se_tk_warpin.o(.rodata); sound/songs/se_tk_warpout.o(.rodata); sound/songs/se_tu_saa.o(.rodata); diff --git a/songs.mk b/songs.mk index fdeaf431f..3179200ec 100644 --- a/songs.mk +++ b/songs.mk @@ -927,5 +927,8 @@ $(MID_SUBDIR)/se_kaidan.s: %.s: %.mid $(MID_SUBDIR)/se_kaifuku.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 +$(MID_SUBDIR)/se_ki_gasyan.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_ki_gasyan.mid b/sound/songs/midi/se_ki_gasyan.mid new file mode 100644 index 000000000..8a57132d9 Binary files /dev/null and b/sound/songs/midi/se_ki_gasyan.mid differ diff --git a/sound/songs/se_ki_gasyan.s b/sound/songs/se_ki_gasyan.s deleted file mode 100644 index 11bcfbf45..000000000 --- a/sound/songs/se_ki_gasyan.s +++ /dev/null @@ -1,76 +0,0 @@ - .include "MPlayDef.s" - - .equ se_ki_gasyan_grp, voicegroup128 - .equ se_ki_gasyan_pri, 4 - .equ se_ki_gasyan_rev, reverb_set+50 - .equ se_ki_gasyan_mvl, 127 - .equ se_ki_gasyan_key, 0 - .equ se_ki_gasyan_tbs, 1 - .equ se_ki_gasyan_exg, 0 - .equ se_ki_gasyan_cmp, 1 - - .section .rodata - .global se_ki_gasyan - .align 2 - -@********************** Track 1 **********************@ - -se_ki_gasyan_1: - .byte KEYSH , se_ki_gasyan_key+0 - .byte TEMPO , 150*se_ki_gasyan_tbs/2 - .byte VOICE , 8 - .byte VOL , 100*se_ki_gasyan_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn3 , v127 - .byte W02 - .byte N02 , Gn2 - .byte W04 - .byte N17 , Cn3 - .byte W06 - .byte VOL , 98*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 91*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 81*se_ki_gasyan_mvl/mxv - .byte W02 - .byte 75*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 60*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 42*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 25*se_ki_gasyan_mvl/mxv - .byte W02 - .byte 10*se_ki_gasyan_mvl/mxv - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_ki_gasyan_2: - .byte VOL , 100*se_ki_gasyan_mvl/mxv - .byte KEYSH , se_ki_gasyan_key+0 - .byte VOICE , 4 - .byte N01 , Cn3 , v064 - .byte W02 - .byte N02 - .byte W04 - .byte N02 - .byte W18 - .byte FINE - -@******************************************************@ - .align 2 - -se_ki_gasyan: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_ki_gasyan_pri @ Priority - .byte se_ki_gasyan_rev @ Reverb. - - .word se_ki_gasyan_grp - - .word se_ki_gasyan_1 - .word se_ki_gasyan_2 - - .end -- cgit v1.2.3 From a9bdd34f9ea12868176375d535cd88d7f21e7668 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:39:11 -0400 Subject: Match se_kon.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_kon.mid | Bin 0 -> 103 bytes sound/songs/se_kon.s | 53 -------------------------------------------- 4 files changed, 4 insertions(+), 54 deletions(-) create mode 100644 sound/songs/midi/se_kon.mid delete mode 100644 sound/songs/se_kon.s diff --git a/ld_script.txt b/ld_script.txt index d537dceac..d0faf6185 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -620,7 +620,7 @@ SECTIONS { sound/songs/se_moter.o(.rodata); sound/songs/midi/se_card.o(.rodata); sound/songs/se_save.o(.rodata); - sound/songs/se_kon.o(.rodata); + sound/songs/midi/se_kon.o(.rodata); sound/songs/se_kon2.o(.rodata); sound/songs/se_kon3.o(.rodata); sound/songs/se_kon4.o(.rodata); diff --git a/songs.mk b/songs.mk index 3179200ec..104f867d2 100644 --- a/songs.mk +++ b/songs.mk @@ -930,5 +930,8 @@ $(MID_SUBDIR)/se_kaifuku.s: %.s: %.mid $(MID_SUBDIR)/se_ki_gasyan.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_kon.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_kon.mid b/sound/songs/midi/se_kon.mid new file mode 100644 index 000000000..438d4b047 Binary files /dev/null and b/sound/songs/midi/se_kon.mid differ diff --git a/sound/songs/se_kon.s b/sound/songs/se_kon.s deleted file mode 100644 index 45a59f4d9..000000000 --- a/sound/songs/se_kon.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kon_grp, voicegroup128 - .equ se_kon_pri, 4 - .equ se_kon_rev, reverb_set+50 - .equ se_kon_mvl, 127 - .equ se_kon_key, 0 - .equ se_kon_tbs, 1 - .equ se_kon_exg, 0 - .equ se_kon_cmp, 1 - - .section .rodata - .global se_kon - .align 2 - -@********************** Track 1 **********************@ - -se_kon_1: - .byte KEYSH , se_kon_key+0 - .byte TEMPO , 150*se_kon_tbs/2 - .byte VOICE , 16 - .byte VOL , 100*se_kon_mvl/mxv - .byte BEND , c_v+1 - .byte N12 , Fn4 , v112 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_kon_2: - .byte KEYSH , se_kon_key+0 - .byte VOICE , 17 - .byte VOL , 100*se_kon_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , Fn4 , v100 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_kon: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kon_pri @ Priority - .byte se_kon_rev @ Reverb. - - .word se_kon_grp - - .word se_kon_1 - .word se_kon_2 - - .end -- cgit v1.2.3 From e6685e5703b8f8c37055f73118c92622160b4fd8 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:40:18 -0400 Subject: Match se_kon2.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_kon2.mid | Bin 0 -> 103 bytes sound/songs/se_kon2.s | 53 ------------------------------------------- 4 files changed, 4 insertions(+), 54 deletions(-) create mode 100644 sound/songs/midi/se_kon2.mid delete mode 100644 sound/songs/se_kon2.s diff --git a/ld_script.txt b/ld_script.txt index d0faf6185..aaf08d042 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -621,7 +621,7 @@ SECTIONS { sound/songs/midi/se_card.o(.rodata); sound/songs/se_save.o(.rodata); sound/songs/midi/se_kon.o(.rodata); - sound/songs/se_kon2.o(.rodata); + sound/songs/midi/se_kon2.o(.rodata); sound/songs/se_kon3.o(.rodata); sound/songs/se_kon4.o(.rodata); sound/songs/se_suikomu.o(.rodata); diff --git a/songs.mk b/songs.mk index 104f867d2..b9466256d 100644 --- a/songs.mk +++ b/songs.mk @@ -933,5 +933,8 @@ $(MID_SUBDIR)/se_ki_gasyan.s: %.s: %.mid $(MID_SUBDIR)/se_kon.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_kon2.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_kon2.mid b/sound/songs/midi/se_kon2.mid new file mode 100644 index 000000000..961d82642 Binary files /dev/null and b/sound/songs/midi/se_kon2.mid differ diff --git a/sound/songs/se_kon2.s b/sound/songs/se_kon2.s deleted file mode 100644 index 127532686..000000000 --- a/sound/songs/se_kon2.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kon2_grp, voicegroup128 - .equ se_kon2_pri, 4 - .equ se_kon2_rev, reverb_set+50 - .equ se_kon2_mvl, 127 - .equ se_kon2_key, 0 - .equ se_kon2_tbs, 1 - .equ se_kon2_exg, 0 - .equ se_kon2_cmp, 1 - - .section .rodata - .global se_kon2 - .align 2 - -@********************** Track 1 **********************@ - -se_kon2_1: - .byte KEYSH , se_kon2_key+0 - .byte TEMPO , 150*se_kon2_tbs/2 - .byte VOICE , 16 - .byte VOL , 100*se_kon2_mvl/mxv - .byte BEND , c_v+1 - .byte N12 , Fn4 , v100 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_kon2_2: - .byte KEYSH , se_kon2_key+0 - .byte VOICE , 17 - .byte VOL , 100*se_kon2_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , Fn4 , v088 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_kon2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kon2_pri @ Priority - .byte se_kon2_rev @ Reverb. - - .word se_kon2_grp - - .word se_kon2_1 - .word se_kon2_2 - - .end -- cgit v1.2.3 From 695d42bf46f21ba729773bf46e586566e5f27783 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:41:40 -0400 Subject: Match se_kon3.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_kon3.mid | Bin 0 -> 103 bytes sound/songs/se_kon3.s | 53 ------------------------------------------- 4 files changed, 4 insertions(+), 54 deletions(-) create mode 100644 sound/songs/midi/se_kon3.mid delete mode 100644 sound/songs/se_kon3.s diff --git a/ld_script.txt b/ld_script.txt index aaf08d042..e961e3481 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -622,7 +622,7 @@ SECTIONS { sound/songs/se_save.o(.rodata); sound/songs/midi/se_kon.o(.rodata); sound/songs/midi/se_kon2.o(.rodata); - sound/songs/se_kon3.o(.rodata); + sound/songs/midi/se_kon3.o(.rodata); sound/songs/se_kon4.o(.rodata); sound/songs/se_suikomu.o(.rodata); sound/songs/se_nageru.o(.rodata); diff --git a/songs.mk b/songs.mk index b9466256d..f6ed42a17 100644 --- a/songs.mk +++ b/songs.mk @@ -936,5 +936,8 @@ $(MID_SUBDIR)/se_kon.s: %.s: %.mid $(MID_SUBDIR)/se_kon2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_kon3.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_kon3.mid b/sound/songs/midi/se_kon3.mid new file mode 100644 index 000000000..fc35f1931 Binary files /dev/null and b/sound/songs/midi/se_kon3.mid differ diff --git a/sound/songs/se_kon3.s b/sound/songs/se_kon3.s deleted file mode 100644 index 4e5ee26fa..000000000 --- a/sound/songs/se_kon3.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kon3_grp, voicegroup128 - .equ se_kon3_pri, 4 - .equ se_kon3_rev, reverb_set+50 - .equ se_kon3_mvl, 127 - .equ se_kon3_key, 0 - .equ se_kon3_tbs, 1 - .equ se_kon3_exg, 0 - .equ se_kon3_cmp, 1 - - .section .rodata - .global se_kon3 - .align 2 - -@********************** Track 1 **********************@ - -se_kon3_1: - .byte KEYSH , se_kon3_key+0 - .byte TEMPO , 150*se_kon3_tbs/2 - .byte VOICE , 16 - .byte VOL , 100*se_kon3_mvl/mxv - .byte BEND , c_v+1 - .byte N12 , Fn4 , v088 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_kon3_2: - .byte KEYSH , se_kon3_key+0 - .byte VOICE , 17 - .byte VOL , 100*se_kon3_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , Fn4 , v072 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_kon3: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kon3_pri @ Priority - .byte se_kon3_rev @ Reverb. - - .word se_kon3_grp - - .word se_kon3_1 - .word se_kon3_2 - - .end -- cgit v1.2.3 From e92eabe961d498069f75ac1ebbbeb56d49c95286 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:42:47 -0400 Subject: Match se_kon4.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_kon4.mid | Bin 0 -> 103 bytes sound/songs/se_kon4.s | 53 ------------------------------------------- 4 files changed, 4 insertions(+), 54 deletions(-) create mode 100644 sound/songs/midi/se_kon4.mid delete mode 100644 sound/songs/se_kon4.s diff --git a/ld_script.txt b/ld_script.txt index e961e3481..f933ee315 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -623,7 +623,7 @@ SECTIONS { sound/songs/midi/se_kon.o(.rodata); sound/songs/midi/se_kon2.o(.rodata); sound/songs/midi/se_kon3.o(.rodata); - sound/songs/se_kon4.o(.rodata); + sound/songs/midi/se_kon4.o(.rodata); sound/songs/se_suikomu.o(.rodata); sound/songs/se_nageru.o(.rodata); sound/songs/se_toy_c.o(.rodata); diff --git a/songs.mk b/songs.mk index f6ed42a17..ed1923c6e 100644 --- a/songs.mk +++ b/songs.mk @@ -939,5 +939,8 @@ $(MID_SUBDIR)/se_kon2.s: %.s: %.mid $(MID_SUBDIR)/se_kon3.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_kon4.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_kon4.mid b/sound/songs/midi/se_kon4.mid new file mode 100644 index 000000000..b0f5561b9 Binary files /dev/null and b/sound/songs/midi/se_kon4.mid differ diff --git a/sound/songs/se_kon4.s b/sound/songs/se_kon4.s deleted file mode 100644 index 4dfe81e34..000000000 --- a/sound/songs/se_kon4.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kon4_grp, voicegroup128 - .equ se_kon4_pri, 4 - .equ se_kon4_rev, reverb_set+50 - .equ se_kon4_mvl, 127 - .equ se_kon4_key, 0 - .equ se_kon4_tbs, 1 - .equ se_kon4_exg, 0 - .equ se_kon4_cmp, 1 - - .section .rodata - .global se_kon4 - .align 2 - -@********************** Track 1 **********************@ - -se_kon4_1: - .byte KEYSH , se_kon4_key+0 - .byte TEMPO , 150*se_kon4_tbs/2 - .byte VOICE , 16 - .byte VOL , 100*se_kon4_mvl/mxv - .byte BEND , c_v+1 - .byte N12 , Fn4 , v076 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_kon4_2: - .byte KEYSH , se_kon4_key+0 - .byte VOICE , 17 - .byte VOL , 100*se_kon4_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , Fn4 , v056 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_kon4: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kon4_pri @ Priority - .byte se_kon4_rev @ Reverb. - - .word se_kon4_grp - - .word se_kon4_1 - .word se_kon4_2 - - .end -- cgit v1.2.3 From 7f2ddee417145d4b89359feae78cbdb2e0074556 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:45:01 -0400 Subject: Match se_kouka_h.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_kouka_h.mid | Bin 0 -> 271 bytes sound/songs/se_kouka_h.s | 105 ---------------------------------------- 4 files changed, 4 insertions(+), 106 deletions(-) create mode 100644 sound/songs/midi/se_kouka_h.mid delete mode 100644 sound/songs/se_kouka_h.s diff --git a/ld_script.txt b/ld_script.txt index f933ee315..a1385aff2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -578,7 +578,7 @@ SECTIONS { sound/songs/midi/se_jitensya.o(.rodata); sound/songs/se_kouka_l.o(.rodata); sound/songs/se_kouka_m.o(.rodata); - sound/songs/se_kouka_h.o(.rodata); + sound/songs/midi/se_kouka_h.o(.rodata); sound/songs/midi/se_bowa2.o(.rodata); sound/songs/se_poke_dead.o(.rodata); sound/songs/se_nigeru.o(.rodata); diff --git a/songs.mk b/songs.mk index ed1923c6e..e44359c91 100644 --- a/songs.mk +++ b/songs.mk @@ -942,5 +942,8 @@ $(MID_SUBDIR)/se_kon3.s: %.s: %.mid $(MID_SUBDIR)/se_kon4.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_kouka_h.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/songs/midi/se_kouka_h.mid b/sound/songs/midi/se_kouka_h.mid new file mode 100644 index 000000000..e70b12901 Binary files /dev/null and b/sound/songs/midi/se_kouka_h.mid differ diff --git a/sound/songs/se_kouka_h.s b/sound/songs/se_kouka_h.s deleted file mode 100644 index 955d3c077..000000000 --- a/sound/songs/se_kouka_h.s +++ /dev/null @@ -1,105 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kouka_h_grp, voicegroup127 - .equ se_kouka_h_pri, 5 - .equ se_kouka_h_rev, reverb_set+50 - .equ se_kouka_h_mvl, 127 - .equ se_kouka_h_key, 0 - .equ se_kouka_h_tbs, 1 - .equ se_kouka_h_exg, 0 - .equ se_kouka_h_cmp, 1 - - .section .rodata - .global se_kouka_h - .align 2 - -@********************** Track 1 **********************@ - -se_kouka_h_1: - .byte KEYSH , se_kouka_h_key+0 - .byte TEMPO , 90*se_kouka_h_tbs/2 - .byte VOICE , 125 - .byte VOL , 110*se_kouka_h_mvl/mxv - .byte N03 , Cn3 , v100 - .byte W03 - .byte An2 - .byte W03 - .byte Cn3 - .byte W03 - .byte N06 , Gn3 , v072 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v052 - .byte W03 - .byte N06 , Gn3 , v048 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v028 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte N03 , Cn3 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v012 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_kouka_h_2: - .byte KEYSH , se_kouka_h_key+0 - .byte VOICE , 0 - .byte VOL , 110*se_kouka_h_mvl/mxv - .byte N03 , Cn4 , v127 - .byte W03 - .byte Cn3 - .byte W03 - .byte Cn4 - .byte W03 - .byte N06 , Gn3 , v088 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v064 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v044 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v028 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte N03 , Cn3 , v012 - .byte W03 - .byte N06 , Gn3 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_kouka_h: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kouka_h_pri @ Priority - .byte se_kouka_h_rev @ Reverb. - - .word se_kouka_h_grp - - .word se_kouka_h_1 - .word se_kouka_h_2 - - .end -- cgit v1.2.3 From dd0e53a144fec114833cbf13d9358927c6b11e8d Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:46:11 -0400 Subject: Match se_kouka_l.mid --- ld_script.txt | 2 +- songs.mk | 3 +++ sound/songs/midi/se_kouka_l.mid | Bin 0 -> 103 bytes sound/songs/se_kouka_l.s | 56 ---------------------------------------- 4 files changed, 4 insertions(+), 57 deletions(-) create mode 100644 sound/songs/midi/se_kouka_l.mid delete mode 100644 sound/songs/se_kouka_l.s diff --git a/ld_script.txt b/ld_script.txt index a1385aff2..4461d2535 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -576,7 +576,7 @@ SECTIONS { sound/songs/midi/se_kaidan.o(.rodata); sound/songs/midi/se_dansa.o(.rodata); sound/songs/midi/se_jitensya.o(.rodata); - sound/songs/se_kouka_l.o(.rodata); + sound/songs/midi/se_kouka_l.o(.rodata); sound/songs/se_kouka_m.o(.rodata); sound/songs/midi/se_kouka_h.o(.rodata); sound/songs/midi/se_bowa2.o(.rodata); diff --git a/songs.mk b/songs.mk index e44359c91..5b20250be 100644 --- a/songs.mk +++ b/songs.mk @@ -945,5 +945,8 @@ $(MID_SUBDIR)/se_kon4.s: %.s: %.mid $(MID_SUBDIR)/se_kouka_h.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 +$(MID_SUBDIR)/se_kouka_l.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/songs/midi/se_kouka_l.mid b/sound/songs/midi/se_kouka_l.mid new file mode 100644 index 000000000..34aafbb18 Binary files /dev/null and b/sound/songs/midi/se_kouka_l.mid differ diff --git a/sound/songs/se_kouka_l.s b/sound/songs/se_kouka_l.s deleted file mode 100644 index f00241b69..000000000 --- a/sound/songs/se_kouka_l.s +++ /dev/null @@ -1,56 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kouka_l_grp, voicegroup127 - .equ se_kouka_l_pri, 5 - .equ se_kouka_l_rev, reverb_set+50 - .equ se_kouka_l_mvl, 127 - .equ se_kouka_l_key, 0 - .equ se_kouka_l_tbs, 1 - .equ se_kouka_l_exg, 0 - .equ se_kouka_l_cmp, 1 - - .section .rodata - .global se_kouka_l - .align 2 - -@********************** Track 1 **********************@ - -se_kouka_l_1: - .byte KEYSH , se_kouka_l_key+0 - .byte TEMPO , 90*se_kouka_l_tbs/2 - .byte VOICE , 127 - .byte VOL , 110*se_kouka_l_mvl/mxv - .byte N03 , Gn2 , v100 - .byte W03 - .byte N06 , As2 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_kouka_l_2: - .byte KEYSH , se_kouka_l_key+0 - .byte VOICE , 0 - .byte VOL , 110*se_kouka_l_mvl/mxv - .byte N09 , As1 , v127 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_kouka_l: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kouka_l_pri @ Priority - .byte se_kouka_l_rev @ Reverb. - - .word se_kouka_l_grp - - .word se_kouka_l_1 - .word se_kouka_l_2 - - .end -- cgit v1.2.3 From de8013c6d10084dff4c8df6546e556071dc6ba64 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 16:47:27 -0400 Subject: Match se_kouka_m.mid --- ld_script.txt | 2 +- songs.mk | 3 ++ sound/songs/midi/se_kouka_m.mid | Bin 0 -> 123 bytes sound/songs/se_kouka_m.s | 82 ---------------------------------------- 4 files changed, 4 insertions(+), 83 deletions(-) create mode 100644 sound/songs/midi/se_kouka_m.mid delete mode 100644 sound/songs/se_kouka_m.s diff --git a/ld_script.txt b/ld_script.txt index 4461d2535..8e73eaef8 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -577,7 +577,7 @@ SECTIONS { sound/songs/midi/se_dansa.o(.rodata); sound/songs/midi/se_jitensya.o(.rodata); sound/songs/midi/se_kouka_l.o(.rodata); - sound/songs/se_kouka_m.o(.rodata); + sound/songs/midi/se_kouka_m.o(.rodata); sound/songs/midi/se_kouka_h.o(.rodata); sound/songs/midi/se_bowa2.o(.rodata); sound/songs/se_poke_dead.o(.rodata); diff --git a/songs.mk b/songs.mk index 5b20250be..dd65ffce7 100644 --- a/songs.mk +++ b/songs.mk @@ -948,5 +948,8 @@ $(MID_SUBDIR)/se_kouka_h.s: %.s: %.mid $(MID_SUBDIR)/se_kouka_l.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 +$(MID_SUBDIR)/se_kouka_m.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/songs/midi/se_kouka_m.mid b/sound/songs/midi/se_kouka_m.mid new file mode 100644 index 000000000..d98bd0027 Binary files /dev/null and b/sound/songs/midi/se_kouka_m.mid differ diff --git a/sound/songs/se_kouka_m.s b/sound/songs/se_kouka_m.s deleted file mode 100644 index b285c1566..000000000 --- a/sound/songs/se_kouka_m.s +++ /dev/null @@ -1,82 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kouka_m_grp, voicegroup127 - .equ se_kouka_m_pri, 5 - .equ se_kouka_m_rev, reverb_set+50 - .equ se_kouka_m_mvl, 127 - .equ se_kouka_m_key, 0 - .equ se_kouka_m_tbs, 1 - .equ se_kouka_m_exg, 0 - .equ se_kouka_m_cmp, 1 - - .section .rodata - .global se_kouka_m - .align 2 - -@********************** Track 1 **********************@ - -se_kouka_m_1: - .byte KEYSH , se_kouka_m_key+0 - .byte TEMPO , 90*se_kouka_m_tbs/2 - .byte VOICE , 125 - .byte VOL , 110*se_kouka_m_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , As2 , v100 - .byte W03 - .byte BEND , c_v-33 - .byte N36 , Ds3 - .byte W03 - .byte BEND , c_v+0 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_kouka_m_2: - .byte KEYSH , se_kouka_m_key+0 - .byte VOICE , 0 - .byte VOL , 110*se_kouka_m_mvl/mxv - .byte N03 , Cn3 , v127 - .byte W03 - .byte N18 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_kouka_m: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kouka_m_pri @ Priority - .byte se_kouka_m_rev @ Reverb. - - .word se_kouka_m_grp - - .word se_kouka_m_1 - .word se_kouka_m_2 - - .end -- cgit v1.2.3