aboutsummaryrefslogtreecommitdiffstats
path: root/audio/sfx/get_key_item_3.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2019-07-27 23:21:39 -0500
committerdannye <33dannye@gmail.com>2019-07-27 23:21:39 -0500
commit20c4116788d4d29b14c85ffce77e65faf89716b7 (patch)
tree7dcc36a1b3568ebe5b98b3cc7ddb8344a2162cc9 /audio/sfx/get_key_item_3.asm
parentMerge pull request #220 from Rangi42/master (diff)
downloadpokeyellow-20c4116788d4d29b14c85ffce77e65faf89716b7.tar.gz
pokeyellow-20c4116788d4d29b14c85ffce77e65faf89716b7.tar.xz
pokeyellow-20c4116788d4d29b14c85ffce77e65faf89716b7.zip
Update audio macro names
change audio channel numbers from 0-7 back to 1-8 change all note macros back to single note macro todo: fix comments with old macro names, update noise macros/instrument names
Diffstat (limited to 'audio/sfx/get_key_item_3.asm')
-rw-r--r--audio/sfx/get_key_item_3.asm94
1 files changed, 47 insertions, 47 deletions
diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm
index aebae361..c1063a7f 100644
--- a/audio/sfx/get_key_item_3.asm
+++ b/audio/sfx/get_key_item_3.asm
@@ -1,59 +1,59 @@
-SFX_Get_Key_Item_3_Ch4:
- executemusic
+SFX_Get_Key_Item_3_Ch5:
+ execute_music
tempo 256
volume 7, 7
- duty 2
- toggleperfectpitch
- notetype 5, 10, 4
+ duty_cycle 2
+ toggle_perfect_pitch
+ note_type 5, 10, 4
octave 3
- A# 4
- notetype 5, 11, 1
+ note A#, 4
+ note_type 5, 11, 1
octave 4
- C_ 2
- C_ 1
- C_ 1
- notetype 5, 10, 4
- D# 4
- notetype 5, 11, 1
- F_ 2
- F_ 1
- F_ 1
- notetype 5, 11, 4
- A# 8
- endchannel
+ note C_, 2
+ note C_, 1
+ note C_, 1
+ note_type 5, 10, 4
+ note D#, 4
+ note_type 5, 11, 1
+ note F_, 2
+ note F_, 1
+ note F_, 1
+ note_type 5, 11, 4
+ note A#, 8
+ sound_ret
-SFX_Get_Key_Item_3_Ch5:
- executemusic
+SFX_Get_Key_Item_3_Ch6:
+ execute_music
vibrato 4, 2, 3
- duty 2
- notetype 5, 13, 1
+ duty_cycle 2
+ note_type 5, 13, 1
octave 4
- G_ 2
- G_ 1
- G_ 1
- notetype 5, 12, 4
- D# 4
- notetype 5, 13, 1
- G# 2
- G# 1
- G# 1
- A# 2
- A# 1
- A# 1
- notetype 5, 12, 4
+ note G_, 2
+ note G_, 1
+ note G_, 1
+ note_type 5, 12, 4
+ note D#, 4
+ note_type 5, 13, 1
+ note G#, 2
+ note G#, 1
+ note G#, 1
+ note A#, 2
+ note A#, 1
+ note A#, 1
+ note_type 5, 12, 4
octave 5
- D# 8
- endchannel
+ note D#, 8
+ sound_ret
-SFX_Get_Key_Item_3_Ch6:
- executemusic
- notetype 5, 1, 0
+SFX_Get_Key_Item_3_Ch7:
+ execute_music
+ note_type 5, 1, 0
octave 4
- D# 4
- G# 4
- G_ 4
- F_ 4
- D# 8
- endchannel
+ note D#, 4
+ note G#, 4
+ note G_, 4
+ note F_, 4
+ note D#, 8
+ sound_ret