From 35adf6842d51687aac8be8528372f36150dfb686 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Thu, 16 Jun 2022 20:26:40 -0500 Subject: [PATCH] Pull wave samples out into audio/wave_samples.asm --- audio/engine_0f.asm | 11 +---------- audio/engine_10.asm | 11 +---------- audio/engine_11.asm | 11 +---------- audio/engine_12.asm | 11 +---------- audio/engine_13.asm | 11 +---------- audio/wave_samples.asm | 5 +++++ 6 files changed, 10 insertions(+), 50 deletions(-) create mode 100644 audio/wave_samples.asm diff --git a/audio/engine_0f.asm b/audio/engine_0f.asm index a796604..d16dab5 100644 --- a/audio/engine_0f.asm +++ b/audio/engine_0f.asm @@ -1876,16 +1876,7 @@ Data_3cb20: dw $fded WavePatterns_BankF: -WavePattern0_BankF: ; 0x3cb52 - db $02, $46, $8A, $CE, $FF, $FE, $ED, $DC, $CB, $A9, $87, $65, $44, $33, $22, $11 -WavePattern1_BankF: ; 0x3cb62 - db $02, $46, $8A, $CE, $EF, $FF, $FE, $EE, $DD, $CB, $A9, $87, $65, $43, $22, $11 -WavePattern2_BankF: ; 0x3cb72 - db $01, $23, $43, $21, $FE, $CA, $8A, $CE, $01, $23, $43, $21, $FE, $CA, $8A, $CE -WavePattern3_BankF: ; 0x3cb82 - db $00, $11, $22, $33, $44, $33, $22, $11, $FF, $EE, $CC, $AA, $88, $AA, $CC, $EE -WavePattern4_BankF: ; 0x3cb92 - db $00, $11, $22, $33, $44, $33, $22, $11, $FF, $EE, $CC, $AA, $88, $AA, $CC, $EE +INCLUDE "audio/wave_samples.asm" INCLUDE "audio/drumkits_0f.asm" diff --git a/audio/engine_10.asm b/audio/engine_10.asm index 1afe86a..37b6b18 100644 --- a/audio/engine_10.asm +++ b/audio/engine_10.asm @@ -1871,16 +1871,7 @@ Data_40b20: dw $fded WavePatterns_Bank10: -WavePattern0_Bank10: - db $02, $46, $8A, $CE, $FF, $FE, $ED, $DC, $CB, $A9, $87, $65, $44, $33, $22, $11 -WavePattern1_Bank10: - db $02, $46, $8A, $CE, $EF, $FF, $FE, $EE, $DD, $CB, $A9, $87, $65, $43, $22, $11 -WavePattern2_Bank10: - db $01, $23, $43, $21, $FE, $CA, $8A, $CE, $01, $23, $43, $21, $FE, $CA, $8A, $CE -WavePattern3_Bank10: - db $00, $11, $22, $33, $44, $33, $22, $11, $FF, $EE, $CC, $AA, $88, $AA, $CC, $EE -WavePattern4_Bank10: - db $00, $11, $22, $33, $44, $33, $22, $11, $FF, $EE, $CC, $AA, $88, $AA, $CC, $EE +INCLUDE "audio/wave_samples.asm" INCLUDE "audio/drumkits_10.asm" diff --git a/audio/engine_11.asm b/audio/engine_11.asm index b34ed5e..323c278 100644 --- a/audio/engine_11.asm +++ b/audio/engine_11.asm @@ -1871,16 +1871,7 @@ Data_44b20: dw $fded WavePatterns_Bank11: -WavePattern0_Bank11: - db $02, $46, $8A, $CE, $FF, $FE, $ED, $DC, $CB, $A9, $87, $65, $44, $33, $22, $11 -WavePattern1_Bank11: - db $02, $46, $8A, $CE, $EF, $FF, $FE, $EE, $DD, $CB, $A9, $87, $65, $43, $22, $11 -WavePattern2_Bank11: - db $01, $23, $43, $21, $FE, $CA, $8A, $CE, $01, $23, $43, $21, $FE, $CA, $8A, $CE -WavePattern3_Bank11: - db $00, $11, $22, $33, $44, $33, $22, $11, $FF, $EE, $CC, $AA, $88, $AA, $CC, $EE -WavePattern4_Bank11: - db $00, $11, $22, $33, $44, $33, $22, $11, $FF, $EE, $CC, $AA, $88, $AA, $CC, $EE +INCLUDE "audio/wave_samples.asm" INCLUDE "audio/drumkits_11.asm" diff --git a/audio/engine_12.asm b/audio/engine_12.asm index da6d8fe..b67f231 100644 --- a/audio/engine_12.asm +++ b/audio/engine_12.asm @@ -1871,16 +1871,7 @@ Data_48b20: dw $fded WavePatterns_Bank12: -WavePattern0_Bank12: - db $02, $46, $8A, $CE, $FF, $FE, $ED, $DC, $CB, $A9, $87, $65, $44, $33, $22, $11 -WavePattern1_Bank12: - db $02, $46, $8A, $CE, $EF, $FF, $FE, $EE, $DD, $CB, $A9, $87, $65, $43, $22, $11 -WavePattern2_Bank12: - db $01, $23, $43, $21, $FE, $CA, $8A, $CE, $01, $23, $43, $21, $FE, $CA, $8A, $CE -WavePattern3_Bank12: - db $00, $11, $22, $33, $44, $33, $22, $11, $FF, $EE, $CC, $AA, $88, $AA, $CC, $EE -WavePattern4_Bank12: - db $00, $11, $22, $33, $44, $33, $22, $11, $FF, $EE, $CC, $AA, $88, $AA, $CC, $EE +INCLUDE "audio/wave_samples.asm" INCLUDE "audio/drumkits_12.asm" diff --git a/audio/engine_13.asm b/audio/engine_13.asm index c80d700..725cb7c 100644 --- a/audio/engine_13.asm +++ b/audio/engine_13.asm @@ -1871,16 +1871,7 @@ Data_4cb20: dw $fded WavePatterns_Bank13: -WavePattern0_Bank13: - db $02, $46, $8A, $CE, $FF, $FE, $ED, $DC, $CB, $A9, $87, $65, $44, $33, $22, $11 -WavePattern1_Bank13: - db $02, $46, $8A, $CE, $EF, $FF, $FE, $EE, $DD, $CB, $A9, $87, $65, $43, $22, $11 -WavePattern2_Bank13: - db $01, $23, $43, $21, $FE, $CA, $8A, $CE, $01, $23, $43, $21, $FE, $CA, $8A, $CE -WavePattern3_Bank13: - db $00, $11, $22, $33, $44, $33, $22, $11, $FF, $EE, $CC, $AA, $88, $AA, $CC, $EE -WavePattern4_Bank13: - db $00, $11, $22, $33, $44, $33, $22, $11, $FF, $EE, $CC, $AA, $88, $AA, $CC, $EE +INCLUDE "audio/wave_samples.asm" INCLUDE "audio/drumkits_13.asm" diff --git a/audio/wave_samples.asm b/audio/wave_samples.asm new file mode 100644 index 0000000..3a404d4 --- /dev/null +++ b/audio/wave_samples.asm @@ -0,0 +1,5 @@ + db $02, $46, $8A, $CE, $FF, $FE, $ED, $DC, $CB, $A9, $87, $65, $44, $33, $22, $11 + db $02, $46, $8A, $CE, $EF, $FF, $FE, $EE, $DD, $CB, $A9, $87, $65, $43, $22, $11 + db $01, $23, $43, $21, $FE, $CA, $8A, $CE, $01, $23, $43, $21, $FE, $CA, $8A, $CE + db $00, $11, $22, $33, $44, $33, $22, $11, $FF, $EE, $CC, $AA, $88, $AA, $CC, $EE + db $00, $11, $22, $33, $44, $33, $22, $11, $FF, $EE, $CC, $AA, $88, $AA, $CC, $EE