From 2d562a673bbef2c8ecb7cfb9d5b1d080552dd465 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 27 Jun 2020 22:24:13 -0400 Subject: Factor out shared audio/notes.asm --- audio/engine_1.asm | 13 +------------ audio/engine_2.asm | 13 +------------ audio/engine_3.asm | 13 +------------ audio/notes.asm | 12 ++++++++++++ 4 files changed, 15 insertions(+), 36 deletions(-) create mode 100644 audio/notes.asm diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 11962d55..0f76f576 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1723,15 +1723,4 @@ Audio1_HWChannelEnableMasks: db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 Audio1_Pitches: - dw $F82C ; C_ - dw $F89D ; C# - dw $F907 ; D_ - dw $F96B ; D# - dw $F9CA ; E_ - dw $FA23 ; F_ - dw $FA77 ; F# - dw $FAC7 ; G_ - dw $FB12 ; G# - dw $FB58 ; A_ - dw $FB9B ; A# - dw $FBDA ; B_ +INCLUDE "audio/notes.asm" diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 026ade7c..2e0aad0d 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1786,15 +1786,4 @@ Audio2_HWChannelEnableMasks: db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 Audio2_Pitches: - dw $F82C ; C_ - dw $F89D ; C# - dw $F907 ; D_ - dw $F96B ; D# - dw $F9CA ; E_ - dw $FA23 ; F_ - dw $FA77 ; F# - dw $FAC7 ; G_ - dw $FB12 ; G# - dw $FB58 ; A_ - dw $FB9B ; A# - dw $FBDA ; B_ +INCLUDE "audio/notes.asm" diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 4085dd3c..771b44df 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -1723,15 +1723,4 @@ Audio3_HWChannelEnableMasks: db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 Audio3_Pitches: - dw $F82C ; C_ - dw $F89D ; C# - dw $F907 ; D_ - dw $F96B ; D# - dw $F9CA ; E_ - dw $FA23 ; F_ - dw $FA77 ; F# - dw $FAC7 ; G_ - dw $FB12 ; G# - dw $FB58 ; A_ - dw $FB9B ; A# - dw $FBDA ; B_ +INCLUDE "audio/notes.asm" diff --git a/audio/notes.asm b/audio/notes.asm new file mode 100644 index 00000000..025eb6a8 --- /dev/null +++ b/audio/notes.asm @@ -0,0 +1,12 @@ + dw $F82C ; C_ + dw $F89D ; C# + dw $F907 ; D_ + dw $F96B ; D# + dw $F9CA ; E_ + dw $FA23 ; F_ + dw $FA77 ; F# + dw $FAC7 ; G_ + dw $FB12 ; G# + dw $FB58 ; A_ + dw $FB9B ; A# + dw $FBDA ; B_ -- cgit v1.2.3