diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-06-27 22:46:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-27 22:46:52 -0400 |
| commit | 56505958078db1c116aa883e0c7ecf631181475e (patch) | |
| tree | 6a6440325a178ad61e72e9eb363dc820e31b32cc /audio | |
| parent | Move mon_nest_icon.png to gfx/town_map (diff) | |
| parent | Move trade bubble from gfx/icons to gfx/trade (diff) | |
| download | pokeyellow-56505958078db1c116aa883e0c7ecf631181475e.tar.gz pokeyellow-56505958078db1c116aa883e0c7ecf631181475e.tar.xz pokeyellow-56505958078db1c116aa883e0c7ecf631181475e.zip | |
Merge pull request #253 from Rangi42/master
Individual images for party menu icon graphics
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/engine_1.asm | 13 | ||||
| -rw-r--r-- | audio/engine_2.asm | 13 | ||||
| -rw-r--r-- | audio/engine_3.asm | 13 | ||||
| -rw-r--r-- | audio/notes.asm | 12 |
4 files changed, 15 insertions, 36 deletions
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_ |