Skip to content

Commit

Permalink
Use proper Pinball drumkits
Browse files Browse the repository at this point in the history
  • Loading branch information
@dannye
dannye committed Jun 12, 2024
1 parent 546d43f commit 480fe39
Show file tree
Hide file tree
Showing 18 changed files with 113 additions and 17 deletions.
96 changes: 96 additions & 0 deletions crysaudio/drumkits.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ Drumkits:
dw Drumkit4
dw Drumkit5
dw Drumkit6
dw Drumkit7
dw Drumkit8
dw Drumkit9

Drumkit0:
dw Drum00
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/bluefield.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/catchemblue.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/catchemred.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/endcredits.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/fieldselect.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/gameover.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/gengarinthegraveyard.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/hiscore.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/meowthstage.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/mewtwostage.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/nameentry.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/pokedex.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/redfield.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/seelstage.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/title.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/whackthediglett.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion crysaudio/music/pinball/whackthedugtrio.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 480fe39

Please sign in to comment.