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: [PATCH] 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 0000000000000000000000000000000000000000..7a965abf505b4a246e888aa2665899b8d7a6967e GIT binary patch literal 266 zcmYL@Jqp555QJx6#Fb!a5m6zf7NS-u6I&tRPe4HgkwgR=@d8gfOT9^Q1HDOZ689y7 z%`&^Q-!NfxiUHI?u;7Hz^(EOE=20;ny9pV)N~s{bU+eQUZy5Vl}QFa3bU{9%OBTD uF!$fb$ESnLl=1QM`jl}*oDgf`rQ$B#Jy@SMGGovCD&vEAiha7z%a|{4r8^G* literal 0 HcmV?d00001 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