From 480fe391e959fd687053c71d7b844deaa30c448c Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Wed, 12 Jun 2024 17:47:45 -0500 Subject: [PATCH] Use proper Pinball drumkits --- crysaudio/drumkits.asm | 96 +++++++++++++++++++ crysaudio/music/pinball/bluefield.asm | 2 +- crysaudio/music/pinball/catchemblue.asm | 2 +- crysaudio/music/pinball/catchemred.asm | 2 +- crysaudio/music/pinball/endcredits.asm | 2 +- crysaudio/music/pinball/fieldselect.asm | 2 +- crysaudio/music/pinball/gameover.asm | 2 +- .../music/pinball/gengarinthegraveyard.asm | 2 +- crysaudio/music/pinball/hiscore.asm | 2 +- crysaudio/music/pinball/meowthstage.asm | 2 +- crysaudio/music/pinball/mewtwostage.asm | 2 +- crysaudio/music/pinball/nameentry.asm | 2 +- crysaudio/music/pinball/pokedex.asm | 2 +- crysaudio/music/pinball/redfield.asm | 2 +- crysaudio/music/pinball/seelstage.asm | 2 +- crysaudio/music/pinball/title.asm | 2 +- crysaudio/music/pinball/whackthediglett.asm | 2 +- crysaudio/music/pinball/whackthedugtrio.asm | 2 +- 18 files changed, 113 insertions(+), 17 deletions(-) diff --git a/crysaudio/drumkits.asm b/crysaudio/drumkits.asm index b1f775dd6..065af653e 100644 --- a/crysaudio/drumkits.asm +++ b/crysaudio/drumkits.asm @@ -6,6 +6,9 @@ Drumkits: dw Drumkit4 dw Drumkit5 dw Drumkit6 + dw Drumkit7 + dw Drumkit8 + dw Drumkit9 Drumkit0: dw Drum00 @@ -105,6 +108,57 @@ Drumkit6: dw Snare9 dw Snare9 dw Snare9 +Drumkit7: + dw Drum21 + dw Snare12 + dw Snare13 + dw Snare14 + dw Drum38 + dw Drum39 + dw Drum20 + dw Drum27 + dw Drum28 + dw Drum29 + dw Drum40 + dw Drum41 + dw Crash2 + dw Drum21 + dw Drum21 + dw Drum21 +Drumkit8: + dw Drum21 + dw Drum20 + dw Snare13 + dw Snare14 + dw Drum38 + dw Drum33 + dw Triangle5 + dw Drum35 + dw Drum31 + dw Drum32 + dw Drum36 + dw Drum41 + dw Crash1 + dw Drum21 + dw Drum21 + dw Drum21 +Drumkit9: + dw Drum21 + dw Drum40 + dw Drum41 + dw Snare14 + dw Drum38 + dw Drum42 + dw Drum43 + dw Drum44 + dw Drum28 + dw Drum29 + dw Drum45 + dw Drum46 + dw Drum47 + dw Drum21 + dw Drum21 + dw Drum21 Drum00: noise_note 32, 1, 1, 0 @@ -273,3 +327,45 @@ Kick2: noise_note 32, 10, 8, 107 noise_note 32, 7, 1, 0 sound_ret + +Drum38: + noise_note 33, 7, 1, 112 + noise_note 32, 1, 1, 17 + sound_ret + +Drum39: + noise_note 48, 8, 2, 76 + noise_note 34, 6, 1, 32 + sound_ret + +Drum40: + noise_note 1, 1, 8, 1 + sound_ret + +Drum41: + noise_note 1, 2, 8, 1 + sound_ret + +Drum42: + noise_note 1, 3, 8, 1 + sound_ret + +Drum43: + noise_note 1, 4, 8, 1 + sound_ret + +Drum44: + noise_note 1, 5, 8, 1 + sound_ret + +Drum45: + noise_note 1, 6, 8, 1 + sound_ret + +Drum46: + noise_note 1, 7, 8, 1 + sound_ret + +Drum47: + noise_note 1, 8, 8, 1 + sound_ret diff --git a/crysaudio/music/pinball/bluefield.asm b/crysaudio/music/pinball/bluefield.asm index aab43bc8e..9ee74e668 100644 --- a/crysaudio/music/pinball/bluefield.asm +++ b/crysaudio/music/pinball/bluefield.asm @@ -1335,7 +1335,7 @@ Music_BlueField_branch_412dd: sound_ret Music_BlueField_Ch4: - toggle_noise 0 + toggle_noise 7 drum_speed 8 drum_note 7, 4 drum_note 8, 2 diff --git a/crysaudio/music/pinball/catchemblue.asm b/crysaudio/music/pinball/catchemblue.asm index e5fbaaed2..1d8c3ce69 100644 --- a/crysaudio/music/pinball/catchemblue.asm +++ b/crysaudio/music/pinball/catchemblue.asm @@ -1753,7 +1753,7 @@ Music_CatchEmBlue_branch_41b7e: sound_ret Music_CatchEmBlue_Ch4: - toggle_noise 0 + toggle_noise 7 drum_speed 8 drum_note 4, 3 drum_note 3, 3 diff --git a/crysaudio/music/pinball/catchemred.asm b/crysaudio/music/pinball/catchemred.asm index 9ee67d9d6..553c18e00 100644 --- a/crysaudio/music/pinball/catchemred.asm +++ b/crysaudio/music/pinball/catchemred.asm @@ -1062,7 +1062,7 @@ Music_CatchEmRed_branch_3d645: sound_loop 0, Music_CatchEmRed_branch_3d615 Music_CatchEmRed_Ch4: - toggle_noise 0 + toggle_noise 7 drum_speed 8 drum_note 8, 2 drum_note 8, 1 diff --git a/crysaudio/music/pinball/endcredits.asm b/crysaudio/music/pinball/endcredits.asm index 0cb1c331e..d2fa01768 100644 --- a/crysaudio/music/pinball/endcredits.asm +++ b/crysaudio/music/pinball/endcredits.asm @@ -1472,7 +1472,7 @@ Music_EndCredits_branch_4d412: sound_ret Music_EndCredits_Ch4: - toggle_noise 1 + toggle_noise 8 drum_speed 8 drum_note 3, 1 drum_note 2, 1 diff --git a/crysaudio/music/pinball/fieldselect.asm b/crysaudio/music/pinball/fieldselect.asm index 95a803aa6..983c74f10 100644 --- a/crysaudio/music/pinball/fieldselect.asm +++ b/crysaudio/music/pinball/fieldselect.asm @@ -386,7 +386,7 @@ Music_FieldSelect_branch_49678: sound_loop 0, Music_FieldSelect_branch_49678 Music_FieldSelect_Ch4: - toggle_noise 0 + toggle_noise 7 drum_speed 6 drum_note 9, 1 drum_note 9, 1 diff --git a/crysaudio/music/pinball/gameover.asm b/crysaudio/music/pinball/gameover.asm index 7ccd8d03f..cc87b6dff 100644 --- a/crysaudio/music/pinball/gameover.asm +++ b/crysaudio/music/pinball/gameover.asm @@ -165,7 +165,7 @@ Music_GameOver_Ch3: sound_ret Music_GameOver_Ch4: - toggle_noise 0 + toggle_noise 7 drum_speed 8 drum_note 3, 4 drum_note 4, 2 diff --git a/crysaudio/music/pinball/gengarinthegraveyard.asm b/crysaudio/music/pinball/gengarinthegraveyard.asm index b499ff72d..f4460e212 100644 --- a/crysaudio/music/pinball/gengarinthegraveyard.asm +++ b/crysaudio/music/pinball/gengarinthegraveyard.asm @@ -728,7 +728,7 @@ Music_GengarInTheGraveyard_branch_3e382: sound_ret Music_GengarInTheGraveyard_Ch4: - toggle_noise 0 + toggle_noise 7 drum_speed 12 drum_note 6, 16 rest 16 diff --git a/crysaudio/music/pinball/hiscore.asm b/crysaudio/music/pinball/hiscore.asm index e2b585b23..d4a28e32d 100644 --- a/crysaudio/music/pinball/hiscore.asm +++ b/crysaudio/music/pinball/hiscore.asm @@ -1011,7 +1011,7 @@ Music_HiScore_branch_42244: sound_ret Music_HiScore_Ch4: - toggle_noise 1 + toggle_noise 8 drum_speed 8 drum_note 3, 4 drum_note 2, 2 diff --git a/crysaudio/music/pinball/meowthstage.asm b/crysaudio/music/pinball/meowthstage.asm index 5e798f8c7..fc40fc481 100644 --- a/crysaudio/music/pinball/meowthstage.asm +++ b/crysaudio/music/pinball/meowthstage.asm @@ -979,7 +979,7 @@ Music_MeowthStage_branch_49b66: sound_ret Music_MeowthStage_Ch4: - toggle_noise 1 + toggle_noise 8 drum_speed 12 drum_note 1, 16 rest 8 diff --git a/crysaudio/music/pinball/mewtwostage.asm b/crysaudio/music/pinball/mewtwostage.asm index 85dca944c..594a7fc72 100644 --- a/crysaudio/music/pinball/mewtwostage.asm +++ b/crysaudio/music/pinball/mewtwostage.asm @@ -1119,7 +1119,7 @@ Music_MewtwoStage_branch_49237: sound_ret Music_MewtwoStage_Ch4: - toggle_noise 0 + toggle_noise 7 drum_speed 12 drum_note 9, 2 drum_note 9, 2 diff --git a/crysaudio/music/pinball/nameentry.asm b/crysaudio/music/pinball/nameentry.asm index e0be2bbd6..47ae15d3c 100644 --- a/crysaudio/music/pinball/nameentry.asm +++ b/crysaudio/music/pinball/nameentry.asm @@ -1835,7 +1835,7 @@ Music_NameEntry_branch_4ddc7: sound_ret Music_NameEntry_Ch4: - toggle_noise 0 + toggle_noise 7 drum_speed 12 drum_note 6, 16 rest 8 diff --git a/crysaudio/music/pinball/pokedex.asm b/crysaudio/music/pinball/pokedex.asm index ec9237998..65741bcbe 100644 --- a/crysaudio/music/pinball/pokedex.asm +++ b/crysaudio/music/pinball/pokedex.asm @@ -621,7 +621,7 @@ Music_Pokedex_branch_3db3e: sound_loop 0, Music_Pokedex_branch_3db3e Music_Pokedex_Ch4: - toggle_noise 0 + toggle_noise 7 drum_speed 8 drum_note 6, 3 drum_note 2, 1 diff --git a/crysaudio/music/pinball/redfield.asm b/crysaudio/music/pinball/redfield.asm index c6cd51b6e..189625fa1 100644 --- a/crysaudio/music/pinball/redfield.asm +++ b/crysaudio/music/pinball/redfield.asm @@ -1129,7 +1129,7 @@ Music_RedField_branch_3cfe1: sound_loop 0, Music_RedField_branch_3cfe1 Music_RedField_Ch4: - toggle_noise 0 + toggle_noise 7 drum_speed 8 drum_note 8, 4 drum_note 8, 2 diff --git a/crysaudio/music/pinball/seelstage.asm b/crysaudio/music/pinball/seelstage.asm index 4ee8f8e1b..2e262311e 100644 --- a/crysaudio/music/pinball/seelstage.asm +++ b/crysaudio/music/pinball/seelstage.asm @@ -1216,7 +1216,7 @@ Music_SeelStage_branch_45c23: sound_ret Music_SeelStage_Ch4: - toggle_noise 2 + toggle_noise 9 Music_SeelStage_branch_45c59: drum_speed 12 sound_call Music_SeelStage_branch_45d1b diff --git a/crysaudio/music/pinball/title.asm b/crysaudio/music/pinball/title.asm index a0ab31b4b..2886b680f 100644 --- a/crysaudio/music/pinball/title.asm +++ b/crysaudio/music/pinball/title.asm @@ -974,7 +974,7 @@ Music_Title_branch_46222: sound_ret Music_Title_Ch4: - toggle_noise 1 + toggle_noise 8 drum_speed 8 drum_note 3, 1 drum_note 3, 1 diff --git a/crysaudio/music/pinball/whackthediglett.asm b/crysaudio/music/pinball/whackthediglett.asm index 5f58fe05a..0b1d981b1 100644 --- a/crysaudio/music/pinball/whackthediglett.asm +++ b/crysaudio/music/pinball/whackthediglett.asm @@ -675,7 +675,7 @@ Music_WhackTheDiglett_branch_44f8e: sound_ret Music_WhackTheDiglett_Ch4: - toggle_noise 0 + toggle_noise 7 drum_speed 6 drum_note 2, 1 drum_note 2, 1 diff --git a/crysaudio/music/pinball/whackthedugtrio.asm b/crysaudio/music/pinball/whackthedugtrio.asm index 917038ea4..32c824794 100644 --- a/crysaudio/music/pinball/whackthedugtrio.asm +++ b/crysaudio/music/pinball/whackthedugtrio.asm @@ -1060,7 +1060,7 @@ Music_WhackTheDugtrio_branch_4559a: sound_ret Music_WhackTheDugtrio_Ch4: - toggle_noise 1 + toggle_noise 8 drum_speed 12 drum_note 1, 8 drum_speed 8