From 4a10ab5b8fe75fd7dd1da470e737e0ba18d4aec1 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 25 Dec 2022 14:14:27 -0600 Subject: [PATCH] Fix tcg2 channel 3 initial volume --- crysaudio/music/TCG2/credits.asm | 2 +- crysaudio/music/TCG2/diddly1.asm | 4 ++-- crysaudio/music/TCG2/diddly2.asm | 2 +- crysaudio/music/TCG2/diddly3.asm | 4 ++-- crysaudio/music/TCG2/diddly4.asm | 2 +- crysaudio/music/TCG2/diddly6.asm | 2 +- crysaudio/music/TCG2/fort1.asm | 2 +- crysaudio/music/TCG2/fort2.asm | 2 +- crysaudio/music/TCG2/fort3.asm | 2 +- crysaudio/music/TCG2/fort4.asm | 2 +- crysaudio/music/TCG2/gamecorner.asm | 2 +- crysaudio/music/TCG2/grblimp.asm | 2 +- crysaudio/music/TCG2/grcastle.asm | 2 +- crysaudio/music/TCG2/grchallengecup.asm | 2 +- crysaudio/music/TCG2/grdueltheme1.asm | 2 +- crysaudio/music/TCG2/grdueltheme2.asm | 2 +- crysaudio/music/TCG2/grdueltheme3.asm | 2 +- crysaudio/music/TCG2/groverworld.asm | 2 +- crysaudio/music/TCG2/herecomesgr.asm | 2 +- crysaudio/music/TCG2/imakuni2.asm | 2 +- crysaudio/music/TCG2/ishihara.asm | 2 +- crysaudio/music/TCG2/titlescreen.asm | 2 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/crysaudio/music/TCG2/credits.asm b/crysaudio/music/TCG2/credits.asm index ad071dde..5a1b04b7 100644 --- a/crysaudio/music/TCG2/credits.asm +++ b/crysaudio/music/TCG2/credits.asm @@ -4081,7 +4081,7 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) - channel_volume 10 + channel_volume 1 ;fade_wave 16 load_wave 12, 12, 12, 12, 12, 12, 12, 12, 11, 12, 12, 12, 11, 12, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11 ;musicdc 255 diff --git a/crysaudio/music/TCG2/diddly1.asm b/crysaudio/music/TCG2/diddly1.asm index 3f6e739e..24535165 100644 --- a/crysaudio/music/TCG2/diddly1.asm +++ b/crysaudio/music/TCG2/diddly1.asm @@ -184,7 +184,7 @@ Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5) Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17) - channel_volume 10 + channel_volume 1 ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 speed 1 @@ -250,7 +250,7 @@ Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17) note C_, 3 note E_, 3 dec_octave - channel_volume 128 + channel_volume 3 note G_, 2 note A#, 3 inc_octave diff --git a/crysaudio/music/TCG2/diddly2.asm b/crysaudio/music/TCG2/diddly2.asm index f4d5d82c..41a57b37 100644 --- a/crysaudio/music/TCG2/diddly2.asm +++ b/crysaudio/music/TCG2/diddly2.asm @@ -173,7 +173,7 @@ Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf) Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13) - channel_volume 10 + channel_volume 1 fade_wave 14 speed 1 ;musice9 128 diff --git a/crysaudio/music/TCG2/diddly3.asm b/crysaudio/music/TCG2/diddly3.asm index 1558f770..15b4db12 100644 --- a/crysaudio/music/TCG2/diddly3.asm +++ b/crysaudio/music/TCG2/diddly3.asm @@ -53,7 +53,7 @@ Music_Diddly3_Ch1: ; 1ebe76 (7a:7e76) Music_Diddly3_Ch3: ; 1ebe92 (7a:7e92) - channel_volume 10 + channel_volume 1 ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 speed 1 @@ -72,7 +72,7 @@ Music_Diddly3_Ch3: ; 1ebe92 (7a:7e92) note E_, 3 inc_octave note C_, 4 - channel_volume 128 + channel_volume 3 note C_, 4 sound_ret ; 0x1ebeae diff --git a/crysaudio/music/TCG2/diddly4.asm b/crysaudio/music/TCG2/diddly4.asm index 57c9f15c..688b9f10 100644 --- a/crysaudio/music/TCG2/diddly4.asm +++ b/crysaudio/music/TCG2/diddly4.asm @@ -55,7 +55,7 @@ Music_Diddly4_Ch1: ; 1ebec7 (7a:7ec7) Music_Diddly4_Ch3: ; 1ebee0 (7a:7ee0) - channel_volume 10 + channel_volume 1 fade_wave 14 speed 1 channel_volume 2 diff --git a/crysaudio/music/TCG2/diddly6.asm b/crysaudio/music/TCG2/diddly6.asm index bc39c1f2..a85f9899 100644 --- a/crysaudio/music/TCG2/diddly6.asm +++ b/crysaudio/music/TCG2/diddly6.asm @@ -233,7 +233,7 @@ Music_Diddly6_Ch1: ; 1f7731 (7d:7731) Music_Diddly6_Ch3: ; 1f77cf (7d:77cf) - channel_volume 10 + channel_volume 1 ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 channel_volume 1 diff --git a/crysaudio/music/TCG2/fort1.asm b/crysaudio/music/TCG2/fort1.asm index f9b9d3ef..1ba03df1 100644 --- a/crysaudio/music/TCG2/fort1.asm +++ b/crysaudio/music/TCG2/fort1.asm @@ -1004,7 +1004,7 @@ Branch_1edb5a: Music_Fort1_Ch3: ; 1edb66 (7b:5b66) - channel_volume 10 + channel_volume 1 speed 1 fade_wave 14 channel_volume 1 diff --git a/crysaudio/music/TCG2/fort2.asm b/crysaudio/music/TCG2/fort2.asm index 6a379992..d5dd73f6 100644 --- a/crysaudio/music/TCG2/fort2.asm +++ b/crysaudio/music/TCG2/fort2.asm @@ -996,7 +996,7 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f) Music_Fort2_Ch3: ; 1ee319 (7b:6319) - channel_volume 10 + channel_volume 1 ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 channel_volume 2 diff --git a/crysaudio/music/TCG2/fort3.asm b/crysaudio/music/TCG2/fort3.asm index 59d89274..c61dfbad 100644 --- a/crysaudio/music/TCG2/fort3.asm +++ b/crysaudio/music/TCG2/fort3.asm @@ -1291,7 +1291,7 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) - channel_volume 10 + channel_volume 1 speed 1 fade_wave 11 ;musicdc 255 diff --git a/crysaudio/music/TCG2/fort4.asm b/crysaudio/music/TCG2/fort4.asm index 2db9ca63..bf806bbc 100644 --- a/crysaudio/music/TCG2/fort4.asm +++ b/crysaudio/music/TCG2/fort4.asm @@ -1239,7 +1239,7 @@ Branch_1f1c97: Music_Fort4_Ch3: ; 1f1caa (7c:5caa) - channel_volume 10 + channel_volume 1 fade_wave 11 channel_volume 1 ;musice9 96 diff --git a/crysaudio/music/TCG2/gamecorner.asm b/crysaudio/music/TCG2/gamecorner.asm index dea37aeb..8c87bbb4 100644 --- a/crysaudio/music/TCG2/gamecorner.asm +++ b/crysaudio/music/TCG2/gamecorner.asm @@ -829,7 +829,7 @@ Branch_1e778f: Music_TCG2GameCorner_Ch3: ; 1e782f (79:782f) - channel_volume 10 + channel_volume 1 fade_wave 11 channel_volume 1 ;musice9 64 diff --git a/crysaudio/music/TCG2/grblimp.asm b/crysaudio/music/TCG2/grblimp.asm index 0f8dad10..e061e034 100644 --- a/crysaudio/music/TCG2/grblimp.asm +++ b/crysaudio/music/TCG2/grblimp.asm @@ -689,7 +689,7 @@ Branch_1e7e8a: Music_GRBlimp_Ch3: ; 1e7eed (79:7eed) - channel_volume 10 + channel_volume 1 ;musicdc 17 fade_wave 11 channel_volume 1 diff --git a/crysaudio/music/TCG2/grcastle.asm b/crysaudio/music/TCG2/grcastle.asm index 38032b6c..abb414a0 100644 --- a/crysaudio/music/TCG2/grcastle.asm +++ b/crysaudio/music/TCG2/grcastle.asm @@ -1818,7 +1818,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) Music_GRCastle_Ch3: ; 1f2903 (7c:6903) - channel_volume 10 + channel_volume 1 fade_wave 11 channel_volume 1 ;musice9 96 diff --git a/crysaudio/music/TCG2/grchallengecup.asm b/crysaudio/music/TCG2/grchallengecup.asm index 6d9ce1c7..596f2ba4 100644 --- a/crysaudio/music/TCG2/grchallengecup.asm +++ b/crysaudio/music/TCG2/grchallengecup.asm @@ -917,7 +917,7 @@ Branch_1f3150: Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) - channel_volume 10 + channel_volume 1 speed 1 fade_wave 11 channel_volume 1 diff --git a/crysaudio/music/TCG2/grdueltheme1.asm b/crysaudio/music/TCG2/grdueltheme1.asm index 9a5399f6..80bb6553 100644 --- a/crysaudio/music/TCG2/grdueltheme1.asm +++ b/crysaudio/music/TCG2/grdueltheme1.asm @@ -1914,7 +1914,7 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f) - channel_volume 10 + channel_volume 1 speed 1 fade_wave 11 channel_volume 1 diff --git a/crysaudio/music/TCG2/grdueltheme2.asm b/crysaudio/music/TCG2/grdueltheme2.asm index 8e910231..8acb5ce1 100644 --- a/crysaudio/music/TCG2/grdueltheme2.asm +++ b/crysaudio/music/TCG2/grdueltheme2.asm @@ -2148,7 +2148,7 @@ Branch_1efa62: Music_GRDuelTheme2_Ch3: ; 1efa74 (7b:7a74) - channel_volume 10 + channel_volume 1 ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 speed 1 diff --git a/crysaudio/music/TCG2/grdueltheme3.asm b/crysaudio/music/TCG2/grdueltheme3.asm index 8ac2eabb..60d3ea93 100644 --- a/crysaudio/music/TCG2/grdueltheme3.asm +++ b/crysaudio/music/TCG2/grdueltheme3.asm @@ -2146,7 +2146,7 @@ Branch_1f6df4: Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) - channel_volume 10 + channel_volume 1 fade_wave 11 ;musicdc 255 speed 1 diff --git a/crysaudio/music/TCG2/groverworld.asm b/crysaudio/music/TCG2/groverworld.asm index b00a9383..6f268f35 100644 --- a/crysaudio/music/TCG2/groverworld.asm +++ b/crysaudio/music/TCG2/groverworld.asm @@ -1505,7 +1505,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) - channel_volume 10 + channel_volume 1 ;musicdc 17 fade_wave 11 channel_volume 1 diff --git a/crysaudio/music/TCG2/herecomesgr.asm b/crysaudio/music/TCG2/herecomesgr.asm index 20d004a3..6651fab5 100644 --- a/crysaudio/music/TCG2/herecomesgr.asm +++ b/crysaudio/music/TCG2/herecomesgr.asm @@ -1217,7 +1217,7 @@ Branch_1ea90c: Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) - channel_volume 10 + channel_volume 1 speed 1 fade_wave 11 channel_volume 1 diff --git a/crysaudio/music/TCG2/imakuni2.asm b/crysaudio/music/TCG2/imakuni2.asm index 0a1707af..faf3f644 100644 --- a/crysaudio/music/TCG2/imakuni2.asm +++ b/crysaudio/music/TCG2/imakuni2.asm @@ -1415,7 +1415,7 @@ Branch_1f3a58: Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) - channel_volume 10 + channel_volume 1 speed 1 fade_wave 11 ;musicdc 255 diff --git a/crysaudio/music/TCG2/ishihara.asm b/crysaudio/music/TCG2/ishihara.asm index fd995579..83677042 100644 --- a/crysaudio/music/TCG2/ishihara.asm +++ b/crysaudio/music/TCG2/ishihara.asm @@ -1729,7 +1729,7 @@ Branch_1ddc75: Music_Ishihara_Ch3: ; 1dde54 (77:5e54) - channel_volume 10 + channel_volume 1 fade_wave 11 channel_volume 1 ;musice9 96 diff --git a/crysaudio/music/TCG2/titlescreen.asm b/crysaudio/music/TCG2/titlescreen.asm index 9e990dcf..cbd32867 100644 --- a/crysaudio/music/TCG2/titlescreen.asm +++ b/crysaudio/music/TCG2/titlescreen.asm @@ -1932,7 +1932,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) - channel_volume 10 + channel_volume 1 ;musicdc 17 fade_wave 11 channel_volume 1